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 aa073d8af29..a969916ba64 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h @@ -1161,14 +1161,17 @@ template struct Compare_lexicographically : private Store_kernel { template result_type operator()(V const&a, W const&b)const{ CI c(this->kernel()); + + #ifdef CGAL_CXX11 - auto + auto a_begin=c(a,Begin_tag()); + auto b_begin=c(b,Begin_tag()); + auto a_end=c(a,End_tag()); #else - typename CI::result_type + typename CI::result_type a_begin=c(a,Begin_tag()); + typename CI::result_type b_begin=c(b,Begin_tag()); + typename CI::result_type a_end=c(a,End_tag()); #endif - a_begin=c(a,Begin_tag()), - b_begin=c(b,Begin_tag()), - a_end=c(a,End_tag()); result_type res; // can't we do slightly better for Uncertain<*> ? // after res=...; if(is_uncertain(res))return indeterminate(); @@ -1230,14 +1233,18 @@ template struct Equal_points : private Store_kernel { template result_type operator()(V const&a, W const&b)const{ CI c(this->kernel()); + + #ifdef CGAL_CXX11 - auto + auto a_begin=c(a,Begin_tag()); + auto b_begin=c(b,Begin_tag()); + auto a_end=c(a,End_tag()); #else - typename CI::result_type + typename CI::result_type a_begin=c(a,Begin_tag()); + typename CI::result_type b_begin=c(b,Begin_tag()); + typename CI::result_type a_end=c(a,End_tag()); #endif - a_begin=c(a,Begin_tag()), - b_begin=c(b,Begin_tag()), - a_end=c(a,End_tag()); + result_type res = true; // Is using CGAL::possibly for Uncertain really an optimization? do res = res & (*a_begin++ == *b_begin++);