use consistent naming

afabri · Aug 19, 2024 · d2b1ea7 · d2b1ea7
1 parent 63dd907
commit d2b1ea7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
@@ -181,7 +181,7 @@ template <class Base_> struct Kernel_d_interface : public Base_ {
         typedef typename Construct_cartesian_const_iterator_d::result_type Cartesian_const_iterator_d;
         typedef typename Get_functor<Base, Squared_distance_tag>::type Squared_distance_d;
         typedef typename Get_functor<Base, Squared_length_tag>::type Squared_length_d;
-        typedef typename Get_functor<Base, ComputeBbox_tag>::type Compute_bbox_d;
+        typedef typename Get_functor<Base, Construct_Bbox_tag>::type Construct_bbox_d;
         typedef typename Get_functor<Base, Scalar_product_tag>::type Scalar_product_d;
         typedef typename Get_functor<Base, Affine_rank_tag>::type Affine_rank_d;
         typedef typename Get_functor<Base, Affinely_independent_tag>::type Affinely_independent_d;
@@ -260,7 +260,7 @@ template <class Base_> struct Kernel_d_interface : public Base_ {
         Compute_squared_radius_smallest_orthogonal_sphere_d compute_squared_radius_smallest_orthogonal_sphere_d_object()const{ return Compute_squared_radius_smallest_orthogonal_sphere_d(*this); }
         Squared_distance_d squared_distance_d_object()const{ return Squared_distance_d(*this); }
         Squared_length_d squared_length_d_object()const{ return Squared_length_d(*this); }
-        Compute_bbox_d compute_bbox_d_object()const{ return Compute_bbox_d(*this); }
+        Construct_bbox_d construct_bbox_d_object()const{ return Construct_bbox_d(*this); }
         Scalar_product_d scalar_product_d_object()const{ return Scalar_product_d(*this); }
         Center_of_sphere_d center_of_sphere_d_object()const{ return Center_of_sphere_d(*this); }
         Construct_circumcenter_d construct_circumcenter_d_object()const{ return Construct_circumcenter_d(*this); }

diff --git a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
@@ -1008,8 +1008,8 @@ template<class R_> struct Squared_length : private Store_kernel<R_> {
 CGAL_KD_DEFAULT_FUNCTOR(Squared_length_tag,(CartesianDKernelFunctors::Squared_length<K>),(Vector_tag),(Construct_ttag<Vector_cartesian_const_iterator_tag>));
 
 namespace CartesianDKernelFunctors {
-template<class R_> struct ConstructBbox : private Store_kernel<R_> {
-        CGAL_FUNCTOR_INIT_STORE(ConstructBbox)
+template<class R_> struct Construct_Bbox : private Store_kernel<R_> {
+        CGAL_FUNCTOR_INIT_STORE(Construct_Bbox)
         typedef R_ R;
         typedef typename R::Dimension Dimension;
         typedef typename Get_type<R, RT_tag>::type RT;
@@ -1025,7 +1025,7 @@ template<class R_> struct ConstructBbox : private Store_kernel<R_> {
 };
 }
 
-// CGAL_KD_DEFAULT_FUNCTOR(ConstructBbox_tag,(CartesianDKernelFunctors::ConstructBbox<K>),(Point_tag),(Construct_ttag<Point_cartesian_const_iterator_tag>));
+CGAL_KD_DEFAULT_FUNCTOR(Construct_Bbox_tag,(CartesianDKernelFunctors::Construct_Bbox<K>),(Point_tag),(Construct_ttag<Point_cartesian_const_iterator_tag>));
 
 
 namespace CartesianDKernelFunctors {

diff --git a/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h b/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h
@@ -201,7 +201,7 @@ namespace CGAL {
         CGAL_DECL_COMPUTE(Squared_distance);
         CGAL_DECL_COMPUTE(Squared_distance_to_origin);
         CGAL_DECL_COMPUTE(Squared_length);
-        CGAL_DECL_COMPUTE(ComputeBbox);
+        CGAL_DECL_COMPUTE(Construct_Bbox);
         CGAL_DECL_COMPUTE(Squared_radius);
         CGAL_DECL_COMPUTE(Squared_circumradius);
         CGAL_DECL_COMPUTE(Scalar_product);

diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp
@@ -136,7 +136,7 @@ void test2(){
   typedef typename K1::Construct_weighted_point_d CWP;
   typedef typename K1::Power_side_of_bounded_power_sphere_d PSBPS;
   typedef typename K1::Compute_squared_radius_smallest_orthogonal_sphere_d CSRSOS;
-  typedef typename K1::Compute_bbox_d CB;
+  typedef typename K1::Construct_bbox_d CB;
   //typedef typename K1::Point_drop_weight_d PDW;
   typedef CP PDW;
   typedef typename K1::Compute_weight_d PW;
@@ -152,7 +152,7 @@ void test2(){
     (2)
 #endif
     ;
-  CB cb Kinit(compute_bbox_d_object);
+  CB cb Kinit(construct_bbox_d_object);
   CP cp Kinit(construct_point_d_object);
   CV cv Kinit(construct_vector_d_object);
   CCI ci Kinit(construct_cartesian_const_iterator_d_object);
@@ -211,6 +211,7 @@ void test2(){
   PSBPS psbps Kinit(power_side_of_bounded_power_sphere_d_object);
   CSRSOS csrsos Kinit(compute_squared_radius_smallest_orthogonal_sphere_d_object);
 
+  CGAL_USE(cb);
   CGAL_USE(bc);
   CGAL_USE(pol);
   CGAL_USE(cat);