diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h index 94cc9d62bbe..1688b8f59fb 100644 --- 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 struct Kernel_d_interface : public Base_ { typedef typename Construct_cartesian_const_iterator_d::result_type Cartesian_const_iterator_d; typedef typename Get_functor::type Squared_distance_d; typedef typename Get_functor::type Squared_length_d; - typedef typename Get_functor::type Construct_bbox_d; + typedef typename Get_functor::type Construct_bbox_d; typedef typename Get_functor::type Scalar_product_d; typedef typename Get_functor::type Affine_rank_d; typedef typename Get_functor::type Affinely_independent_d; diff --git a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h index 26b2c4403d2..07dff6a3dd7 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h @@ -1008,24 +1008,26 @@ template struct Squared_length : private Store_kernel { CGAL_KD_DEFAULT_FUNCTOR(Squared_length_tag,(CartesianDKernelFunctors::Squared_length),(Vector_tag),(Construct_ttag)); namespace CartesianDKernelFunctors { -template struct Construct_Bbox : private Store_kernel { - CGAL_FUNCTOR_INIT_STORE(Construct_Bbox) +template struct Construct_bbox : private Store_kernel { + CGAL_FUNCTOR_INIT_STORE(Construct_bbox) typedef R_ R; typedef typename R::Dimension Dimension; typedef typename Get_type::type RT; typedef typename Get_type::type Point; typedef typename Get_functor >::type CI; + typedef Bbox result_type; typedef Point argument_type; result_type operator()(Point const&a)const{ CI ci(this->kernel()); - To_interval f; - return result_type(a.dimension(), make_transforming_iterator(ci(a,Begin_tag()),f), make_transforming_iterator(ci(a,End_tag())), f); + typename Real_embeddable_traits::To_interval f; + typename Get_functor::type pd(this->kernel()); + return result_type(pd(a), make_transforming_iterator(ci(a,Begin_tag()),f), make_transforming_iterator(ci(a,End_tag())), f); } }; } -CGAL_KD_DEFAULT_FUNCTOR(Construct_Bbox_tag,(CartesianDKernelFunctors::Construct_Bbox),(Point_tag),(Construct_ttag)); +CGAL_KD_DEFAULT_FUNCTOR(Construct_bbox_tag,(CartesianDKernelFunctors::Construct_bbox),(Point_tag),(Construct_ttag)); namespace CartesianDKernelFunctors { diff --git a/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h b/NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h index f077e3d7ac6..fe210445814 100644 --- 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(Construct_Bbox); + 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 index c6a68e3caca..033f4aad8f5 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -211,7 +211,6 @@ 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); @@ -220,6 +219,7 @@ void test2(){ CGAL_USE(cr); using std::abs; P a=cp(3,4); + CGAL::Bbox,double> bb2 = cb(a); assert(pd(a)==2); assert(pv(a)[1]==4); P b=vp(cv(5,6,7));