From 83cd1ef2d21ef38e42e1d5331fe2ebec6e0836f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 30 Dec 2011 15:22:11 +0000 Subject: [PATCH] add _3 suffix --- Alpha_shapes_3/include/CGAL/Alpha_shape_3.h | 6 +++--- .../include/CGAL/Alpha_shape_cell_base_3.h | 4 ++-- .../include/CGAL/Alpha_shape_vertex_base_3.h | 4 ++-- .../include/CGAL/internal/Lazy_alpha_nt_3.h | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h index cef6367351e..19168a3561d 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2012 INRIA Sophia-Antipolis (France). +// Copyright (c) 1997, 2012 INRIA Sophia-Antipolis (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org); you may redistribute it under @@ -102,8 +102,8 @@ public: typedef typename Dt::Triangulation_data_structure Tds; //extra the type used for representing alpha according to ExactAlphaComparisonTag - typedef typename internal::Alpha_nt_selector::Type_of_alpha NT; - typedef typename internal::Alpha_nt_selector::Compute_squared_radius_3 Compute_squared_radius_3; + typedef typename internal::Alpha_nt_selector_3::Type_of_alpha NT; + typedef typename internal::Alpha_nt_selector_3::Compute_squared_radius_3 Compute_squared_radius_3; typedef NT FT; typedef typename Gt::FT Coord_type; //checks whether tags are correctly set in Vertex and Cell classes diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h index ffa86ff0a5f..1bc171ec679 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2012 INRIA Sophia-Antipolis (France). +// Copyright (c) 1997, 2012 INRIA Sophia-Antipolis (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org); you may redistribute it under @@ -69,7 +69,7 @@ public: typedef Alpha_shape_cell_base_3 Other; }; - typedef typename internal::Alpha_nt_selector::Type_of_alpha NT; + typedef typename internal::Alpha_nt_selector_3::Type_of_alpha NT; typedef CGAL::Alpha_status Alpha_status; typedef Compact_container Alpha_status_container; typedef typename Alpha_status_container::const_iterator diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h index cd89c629b70..6aa3849da11 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2012 INRIA Sophia-Antipolis (France). +// Copyright (c) 1997, 2012 INRIA Sophia-Antipolis (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org); you may redistribute it under @@ -44,7 +44,7 @@ public: }; typedef typename Gt::Point_3 Point; - typedef typename internal::Alpha_nt_selector::Type_of_alpha NT; + typedef typename internal::Alpha_nt_selector_3::Type_of_alpha NT; typedef CGAL::Alpha_status Alpha_status; typedef Compact_container Alpha_status_container; typedef typename Alpha_status_container::const_iterator diff --git a/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h b/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h index 653af0f5376..0b2d4379ca2 100644 --- a/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h +++ b/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h @@ -294,17 +294,17 @@ struct Lazy_compute_squared_radius_3 { template -struct Alpha_nt_selector_impl; +struct Alpha_nt_selector_impl_3; template -struct Alpha_nt_selector_impl +struct Alpha_nt_selector_impl_3 { typedef typename GeomTraits::FT Type_of_alpha; typedef iCompute_squared_radius_3 Compute_squared_radius_3; }; template -struct Alpha_nt_selector_impl +struct Alpha_nt_selector_impl_3 { typedef Lazy_alpha_nt_3 Type_of_alpha; typedef Lazy_compute_squared_radius_3 Functor; @@ -315,7 +315,7 @@ struct Alpha_nt_selector_impl }; template -struct Alpha_nt_selector_impl +struct Alpha_nt_selector_impl_3 { typedef Lazy_alpha_nt_3 Type_of_alpha; typedef Lazy_compute_squared_radius_3 Functor; @@ -326,8 +326,8 @@ struct Alpha_nt_selector_impl }; template -struct Alpha_nt_selector: - public Alpha_nt_selector_impl::value && ExactAlphaComparisonTag::value >, Weighted_tag> {};