From f97d6b8bd9bfbcd2dd622ef897872deef4192f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 14 Mar 2013 10:38:13 +0100 Subject: [PATCH] s/boost::result_of/cpp11::result_of/g --- AABB_tree/include/CGAL/AABB_traits.h | 2 +- .../CGAL/Arr_landmarks_point_location.h | 2 +- .../include/CGAL/Arr_naive_point_location.h | 2 +- .../include/CGAL/Arr_simple_point_location.h | 2 +- .../CGAL/Arr_trapezoid_ric_point_location.h | 2 +- .../CGAL/Arr_triangulation_point_location.h | 2 +- .../CGAL/Arr_walk_along_line_point_location.h | 2 +- .../Circular_kernel_2/intersecting_arcs.cpp | 2 +- .../CGAL/Circular_kernel_2/Circular_arc_2.h | 2 +- .../CGAL/Circular_kernel_2/Line_arc_2.h | 4 +-- .../internal_functions_on_circle_2.h | 4 +-- .../internal_functions_on_circular_arc_2.h | 2 +- .../internal_functions_on_line_arc_2.h | 16 +++++----- .../CGAL/Circular_kernel_intersections.h | 2 +- .../CGAL/Circular_kernel_3/Circular_arc_3.h | 4 +-- .../Circular_kernel_3/Circular_arc_point_3.h | 12 ++++---- .../CGAL/Circular_kernel_3/Line_arc_3.h | 6 ++-- .../function_objects_polynomial_sphere.h | 12 ++++---- .../internal_functions_on_circle_3.h | 2 +- .../internal_functions_on_circular_arc_3.h | 26 ++++++++-------- .../internal_functions_on_line_arc_3.h | 16 +++++----- .../internal_functions_on_sphere_3.h | 20 ++++++------- Filtered_kernel/include/CGAL/Lazy.h | 18 +++++------ .../include/CGAL/Intersection_traits.h | 22 +++++++------- .../Intersections_3/intersection_3_1_impl.h | 14 ++++----- .../test/Intersections_3/call_test.cpp | 12 ++++---- .../CGAL/Circular_kernel_intersections.h | 2 +- .../CGAL/Spherical_kernel_intersections.h | 2 +- Kernel_23/doc/Kernel_23/CGAL/intersections.h | 8 ++--- .../Concepts/FunctionObjectConcepts.h | 8 ++--- Kernel_23/doc/Kernel_23/Kernel_23.txt | 8 ++--- .../Kernel_23/predicates_constructions.tex | 6 ++-- .../Kernel_23_ref/Kernel_Intersect_2.tex | 2 +- .../Kernel_23_ref/Kernel_Intersect_3.tex | 4 +-- .../doc_tex/Kernel_23_ref/intersection.tex | 12 ++++---- Kernel_23/examples/Kernel_23/MyKernel.cpp | 2 +- .../Kernel_23/cartesian_converter.cpp | 2 +- .../include/CGAL/Kernel/function_objects.h | 4 +-- .../include/CGAL/_Result_of_kernel.h | 10 +++---- Kernel_d/doc/Kernel_d/CGAL/intersections_d.h | 6 ++-- .../Kernel_d/Concepts/Kernel--Intersect_d.h | 2 +- Kernel_d/doc/Kernel_d/Kernel_d.txt | 6 ++-- .../Kernel_d/predicates_constructions_d.tex | 4 +-- .../Kernel_d_ref/Kernel_Intersect_d.tex | 2 +- .../doc_tex/Kernel_d_ref/intersection.tex | 2 +- .../include/CGAL/Kernel_d/function_objects.h | 2 +- Kernel_d/include/CGAL/intersections_d.h | 30 +++++++++---------- .../CGAL/Mesh_3/Labeled_mesh_domain_3.h | 4 +-- .../Mesh_3/Robust_intersection_traits_3.h | 6 ++-- 49 files changed, 172 insertions(+), 172 deletions(-) diff --git a/AABB_tree/include/CGAL/AABB_traits.h b/AABB_tree/include/CGAL/AABB_traits.h index cdcac440165..3f873a16660 100644 --- a/AABB_tree/include/CGAL/AABB_traits.h +++ b/AABB_tree/include/CGAL/AABB_traits.h @@ -71,7 +71,7 @@ public: template struct Intersection_and_primitive_id { typedef std::pair< - typename boost::result_of::type, + typename cpp11::result_of::type, typename Primitive::Id > Type; typedef Type type; }; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h index 5d78f55c8c3..c08c3811e4d 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h @@ -79,7 +79,7 @@ public: typedef Arr_point_location_result Result; typedef typename Result::Type Result_type; - // Support boost::result_of + // Support cpp11::result_of typedef Result_type result_type; protected: diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h index 081494c7b19..266f4242d41 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h @@ -55,7 +55,7 @@ public: typedef Arr_point_location_result Result; typedef typename Result::Type Result_type; - // Support boost::result_of + // Support cpp11::result_of typedef Result_type result_type; protected: diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h index 63c7bdb492c..e7077e5539f 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h @@ -57,7 +57,7 @@ public: typedef Arr_point_location_result Result; typedef typename Result::Type Result_type; - // Support boost::result_of + // Support cpp11::result_of typedef Result_type result_type; protected: diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h index b379a4f29ab..d04a91bd8e2 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h @@ -112,7 +112,7 @@ protected: typedef typename Result::Type Result_type; public: - // Support boost::result_of + // Support cpp11::result_of typedef Result_type result_type; protected: diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h index bf4c8e8e3af..9c79950972b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h @@ -106,7 +106,7 @@ public: typedef Arr_point_location_result Result; typedef typename Result::Type Result_type; - // Support boost::result_of + // Support cpp11::result_of typedef Result_type result_type; protected: diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h index 4047434c82c..8b3b615a3aa 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h @@ -58,7 +58,7 @@ public: typedef Arr_point_location_result Result; typedef typename Result::Type Result_type; - // Support boost::result_of + // Support cpp11::result_of typedef Result_type result_type; protected: diff --git a/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp b/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp index 994ffb98846..6d597c2bf5e 100644 --- a/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp +++ b/Circular_kernel_2/examples/Circular_kernel_2/intersecting_arcs.cpp @@ -24,7 +24,7 @@ double prob_2() { if(CGAL::orientation(p4, p5, p6) != CGAL::COUNTERCLOCKWISE) std::swap(p4, p6); T o2 = T(p4, p5, p6); - typedef boost::result_of::type + typedef cpp11::result_of::type Intersection_result; std::vector res; CGAL::intersection(o1, o2, std::back_inserter(res)); diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_2.h index 77f46422b4c..29d44205947 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_2.h @@ -173,7 +173,7 @@ namespace internal { _begin = CGAL::circle_intersect(c, c1, b_1); _end = CGAL::circle_intersect(c, c2, b_2); } else { - typedef std::vector::type> solutions_container; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/Line_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/Line_arc_2.h index 34a888a81fd..5cf4da2b486 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/Line_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/Line_arc_2.h @@ -75,7 +75,7 @@ public: intersect(const Line_2 & l, const Circle_2 & c, const bool b) { - typedef std::vector::type> + typedef std::vector::type> solutions_container; solutions_container solutions; @@ -130,7 +130,7 @@ public: CGAL_kernel_precondition(do_intersect(support, l1)); CGAL_kernel_precondition(do_intersect(support, l2)); //typedef typename Root_of_2::RT RT_2; - typename boost::result_of::type + typename cpp11::result_of::type v = CGAL::internal::intersection(support, l1, CK()); CGAL_assertion(v); diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h index 7a0ef138a44..3168facbf92 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h @@ -35,7 +35,7 @@ circle_intersect( const typename CK::Circle_2 & c1, const typename CK::Circle_2 & c2, bool b ) { - typedef std::vector::type> solutions_container; solutions_container solutions; @@ -122,7 +122,7 @@ namespace CircularFunctors { const typename CK::Circle_2 & c2, OutputIterator res ) { - typedef typename boost::result_of + typedef typename cpp11::result_of ::type result_type; typedef typename CK::Algebraic_kernel AK; typedef typename CK::Polynomial_for_circles_2_2 Equation; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h index 708c3ecb16f..71d5cf03886 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h @@ -542,7 +542,7 @@ namespace CircularFunctors { const typename CK::Circular_arc_2 &a2, OutputIterator res ) { - typedef typename boost::result_of::type result_type; typedef std::vector solutions_container; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h index 5308582995b..05603cdd1b0 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h @@ -381,7 +381,7 @@ namespace CircularFunctors { const typename CK::Circle_2 & c, OutputIterator res ) { - typedef typename boost::result_of + typedef typename cpp11::result_of ::type result_type; typedef typename CK::Algebraic_kernel AK; typedef typename CK::Polynomial_1_2 Equation_line; @@ -416,7 +416,7 @@ namespace CircularFunctors { const typename CK::Line_arc_2 &a2, OutputIterator res ) { - typedef typename boost::result_of + typedef typename cpp11::result_of ::type result_type; typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; typedef typename CK::Line_arc_2 Line_arc_2; @@ -482,7 +482,7 @@ namespace CircularFunctors { } } - typename boost::result_of::type + typename cpp11::result_of::type v = CGAL::internal::intersection(a1.supporting_line(), a2.supporting_line(), CK()); if(!v) return res; @@ -515,7 +515,7 @@ namespace CircularFunctors { const typename CK::Circle_2 &c, OutputIterator res ) { - typedef std::vector::type> + typedef std::vector::type> solutions_container; solutions_container solutions; @@ -557,7 +557,7 @@ namespace CircularFunctors { OutputIterator res ) { typedef std::vector solutions_container; - typedef typename boost::result_of + typedef typename cpp11::result_of ::type result_type; typedef typename CK::Circular_arc_2 Circular_arc_2; typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; @@ -639,7 +639,7 @@ namespace CircularFunctors { *res++ = result_type(std::make_pair(q,1u)); return res; } else { //Case 4b - typedef std::vector::type> + typedef std::vector::type> container; container solutions; CGAL::CircularFunctors::intersect_2( l.supporting_line(), c.supporting_circle(), @@ -763,7 +763,7 @@ namespace CircularFunctors { typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; typedef typename CK::Point_2 Point_2; typedef typename CK::Line_2 Line_2; - typedef typename boost::result_of::type result_type; + typedef typename cpp11::result_of::type result_type; if(LinearFunctors::non_oriented_equal(l, la.supporting_line())) { *res++ = result_type(la); @@ -794,7 +794,7 @@ namespace CircularFunctors { typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; typedef typename CK::Line_2 Line_2; - typedef std::vector< typename boost::result_of::type> + typedef std::vector< typename cpp11::result_of::type> solutions_container; solutions_container solutions; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h b/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h index 18b17f1cd83..99f59846bef 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h @@ -47,7 +47,7 @@ namespace internal { \ bool \ do_intersect(const typename K::A &c1, const typename K::B &c2, const K&) \ { \ - std::vector< typename boost::result_of::type > res; \ + std::vector< typename cpp11::result_of::type > res; \ typename K::Intersect_2()(c1,c2,std::back_inserter(res)); \ return !res.empty(); \ } \ diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_3.h index bdb79d02906..b55541b1a6b 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_3.h @@ -164,7 +164,7 @@ namespace CGAL { const Sphere_3 &s1, bool less_xyz_s1, const Sphere_3 &s2, bool less_xyz_s2) { - typedef typename boost::result_of::type result_type; + typedef typename cpp11::result_of::type result_type; std::vector sols1, sols2; // The spheres must not include the circle CGAL_kernel_precondition(!SK().has_on_3_object()(s1,c)); @@ -191,7 +191,7 @@ namespace CGAL { const Plane_3 &p1, bool less_xyz_p1, const Plane_3 &p2, bool less_xyz_p2) { - typedef typename boost::result_of::type result_type; + typedef typename cpp11::result_of::type result_type; std::vector sols1, sols2; // The planes must not include the circle CGAL_kernel_precondition(!SK().has_on_3_object()(p1,c)); diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h index d7e453314d0..56e233165a3 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h @@ -74,7 +74,7 @@ public: const Sphere_3 &s2, const Sphere_3 &s3, const bool less_xyz = true) { - std::vector::type> sols; + std::vector::type> sols; SK().intersect_3_object()(s1, s2, s3, std::back_inserter(sols)); // s1,s2,s3 must intersect CGAL_kernel_precondition(sols.size() != 0); @@ -97,7 +97,7 @@ public: const Sphere_3 &s1, const Sphere_3 &s2, const bool less_xyz = true) { - std::vector::type> sols; + std::vector::type> sols; SK().intersect_3_object()(p, s1, s2, std::back_inserter(sols)); // s1,s2,s3 must intersect CGAL_kernel_precondition(sols.size() != 0); @@ -120,7 +120,7 @@ public: const Plane_3 &p2, const Sphere_3 &s, const bool less_xyz = true) { - std::vector::type> sols; + std::vector::type> sols; SK().intersect_3_object()(p1, p2, s, std::back_inserter(sols)); // s1,s2,s3 must intersect CGAL_kernel_precondition(sols.size() != 0); @@ -142,7 +142,7 @@ public: Circular_arc_point_3(const Line_3 &l, const Sphere_3 &s, const bool less_xyz = true) { - std::vector::type> sols; + std::vector::type> sols; SK().intersect_3_object()(l, s, std::back_inserter(sols)); // s1,s2,s3 must intersect CGAL_kernel_precondition(sols.size() != 0); @@ -164,7 +164,7 @@ public: Circular_arc_point_3(const Circle_3 &c, const Plane_3 &p, const bool less_xyz = true) { - std::vector::type> sols; + std::vector::type> sols; SK().intersect_3_object()(c, p, std::back_inserter(sols)); // s1,s2,s3 must intersect CGAL_kernel_precondition(sols.size() != 0); @@ -186,7 +186,7 @@ public: Circular_arc_point_3(const Circle_3 &c, const Sphere_3 &s, const bool less_xyz = true) { - std::vector::type> sols; + std::vector::type> sols; SK().intersect_3_object()(c, s, std::back_inserter(sols)); // s1,s2,s3 must intersect CGAL_kernel_precondition(sols.size() != 0); diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Line_arc_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Line_arc_3.h index e5bd52e8222..ed458cc574a 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Line_arc_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Line_arc_3.h @@ -93,7 +93,7 @@ namespace CGAL { const Sphere_3 &s, bool less_xyz_first = true) { - std::vector::type> sols; + std::vector::type> sols; SK().intersect_3_object()(l, s, std::back_inserter(sols)); // l must intersect s in 2 points CGAL_kernel_precondition(sols.size() == 2); @@ -112,7 +112,7 @@ namespace CGAL { const Sphere_3 &s1, bool less_xyz_s1, const Sphere_3 &s2, bool less_xyz_s2) { - std::vector::type> sols1, sols2; + std::vector::type> sols1, sols2; SK().intersect_3_object()(l, s1, std::back_inserter(sols1)); SK().intersect_3_object()(l, s2, std::back_inserter(sols2)); // l must intersect s1 and s2 @@ -135,7 +135,7 @@ namespace CGAL { CGAL_kernel_precondition(!SK().has_on_3_object()(p1,l)); CGAL_kernel_precondition(!SK().has_on_3_object()(p2,l)); // l must intersect p1 and p2 - typedef typename boost::result_of::type Intersection; + typedef typename cpp11::result_of::type Intersection; Intersection i1 = SK().intersect_3_object()(l, p1); Intersection i2 = SK().intersect_3_object()(l, p2); const typename SK::Point_3* point1=boost::get( & *i1 ); diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h index 8455616fa03..dac3b012280 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/function_objects_polynomial_sphere.h @@ -1107,14 +1107,14 @@ template < class SK > \ #define CGAL_SPHERICAL_KERNEL_MACRO_DO_INTERSECTION_3_2(A,B) \ result_type \ operator()(const A & c1, const B & c2) const \ - { std::vector< typename boost::result_of::type > res; \ + { std::vector< typename cpp11::result_of::type > res; \ typename SK::Intersect_3()(c1,c2,std::back_inserter(res)); \ return !res.empty(); } #define CGAL_SPHERICAL_KERNEL_MACRO_DO_INTERSECTION_3_3(A,B,C) \ result_type \ operator()(const A & c1, const B & c2, const C & c3) const \ - { std::vector< typename boost::result_of::type > res; \ + { std::vector< typename cpp11::result_of::type > res; \ typename SK::Intersect_3()(c1,c2,c3,std::back_inserter(res)); \ return !res.empty(); } @@ -1177,7 +1177,7 @@ template < class SK > \ template ::type>::value> struct result_impl - { typedef typename boost::result_of::type + { typedef typename cpp11::result_of::type type; }; template @@ -1191,7 +1191,7 @@ template < class SK > \ // the binary overload always goes to Linear::Intersect_3 template struct result - { typedef typename boost::result_of::type type; }; + { typedef typename cpp11::result_of::type type; }; // we match the ternary case if the last argument is an iterator, // otherwise Linear::Intersect_3 wins @@ -1283,12 +1283,12 @@ template < class SK > \ // forward the intersection functions from the linear kernel template - typename boost::result_of::type + typename cpp11::result_of::type operator()(const A& a, const B& b) { return typename SK::Linear_kernel().intersect_3_object()(a, b); } template - typename boost::result_of::type + typename cpp11::result_of::type operator()(const A& a, const B& b, const C& c, typename boost::enable_if_c::type>::value)>::type* = 0) { return typename SK::Linear_kernel().intersect_3_object()(a, b, c); } diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circle_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circle_3.h index e4259d6ea45..ffb15fb1539 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circle_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circle_3.h @@ -120,7 +120,7 @@ namespace CGAL { typename SK::FT z_coord=extremal_points_z_coordinate(circle,sphere); typename SK::Plane_3 plane(0,0,1,-z_coord); - std::vector::type > inters; intersect_3(circle,plane,std::back_inserter(inters)); diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h index f92d4045410..3de670ea2b9 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h @@ -89,7 +89,7 @@ namespace CGAL { { typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; typedef std::vector< - typename boost::result_of::type + typename cpp11::result_of::type > solutions_container; typedef std::pair Solution; @@ -120,11 +120,11 @@ namespace CGAL { OutputIterator res) { typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; - typedef typename boost::result_of< + typedef typename cpp11::result_of< typename SK::Intersect_3(typename SK::Circle_3, typename SK::Circular_arc_3) >::type result_type; - typedef std::vector::type > solutions_container; typedef std::pair Solution; @@ -159,12 +159,12 @@ namespace CGAL { const typename SK::Circular_arc_3 & c, OutputIterator res) { - typedef typename boost::result_of< + typedef typename cpp11::result_of< typename SK::Intersect_3(typename SK::Sphere_3, typename SK::Circular_arc_3) >::type result_type; typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; - typedef std::vector::type > solutions_container; typedef std::pair Solution; @@ -199,13 +199,13 @@ namespace CGAL { const typename SK::Circular_arc_3 & ca, OutputIterator res) { - typedef typename boost::result_of< + typedef typename cpp11::result_of< typename SK::Intersect_3(typename SK::Plane_3, typename SK::Circular_arc_3) >::type result_type; typedef typename SK::Point_3 Point_3; typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; typedef std::vector< - typename boost::result_of::type + typename cpp11::result_of::type > solutions_container; typedef std::pair Solution; @@ -240,7 +240,7 @@ namespace CGAL { { typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; typedef std::vector< - typename boost::result_of::type> + typename cpp11::result_of::type> solutions_container; typedef std::pair Solution; @@ -273,12 +273,12 @@ namespace CGAL { const typename SK::Circular_arc_3 & a2, OutputIterator res) { - typedef typename boost::result_of< + typedef typename cpp11::result_of< typename SK::Intersect_3(typename SK::Circular_arc_3, typename SK::Circular_arc_3) >::type result_type; typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; typedef typename SK::Circular_arc_3 Circular_arc_3; - typedef std::vector< typename boost::result_of< + typedef std::vector< typename cpp11::result_of< typename SK::Intersect_3(typename SK::Circle_3, typename SK::Circle_3 ) >::type> solutions_container; @@ -427,7 +427,7 @@ namespace CGAL { typename SK::FT z_coord=extremal_points_z_coordinate(arc.supporting_circle(),sphere); typename SK::Plane_3 plane(0,0,1,-z_coord); - std::vector::type> inters; @@ -482,7 +482,7 @@ namespace CGAL { case NORMAL:{ typename SK::FT z_coord=extremal_points_z_coordinate(arc.supporting_circle(),sphere); typename SK::Plane_3 plane(0,0,1,-z_coord); - std::vector::type > inters; @@ -609,7 +609,7 @@ namespace CGAL { { typename SK::Plane_3 plane(sphere.center(),sphere.center()+m,sphere.center()+typename SK::Vector_3(0,0,1)); - std::vector::type> inters; intersect_3(plane,arc,std::back_inserter(inters)); diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h index b827672890e..863a924fc0c 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h @@ -86,9 +86,9 @@ namespace CGAL { typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; typedef typename SK::Line_3 Line_3; typedef typename SK::Line_arc_3 Line_arc_3; - typedef typename boost::result_of::type result_type; + typedef typename cpp11::result_of::type result_type; - typename boost::result_of::type o = + typename cpp11::result_of::type o = SK().intersect_3_object()(l1.supporting_line(), l2.supporting_line()); @@ -153,9 +153,9 @@ namespace CGAL { typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; typedef typename SK::Line_3 Line_3; typedef typename SK::Line_arc_3 Line_arc_3; - typedef typename boost::result_of::type result_type; + typedef typename cpp11::result_of::type result_type; - typename boost::result_of::type o = + typename cpp11::result_of::type o = SK().intersect_3_object()(l, la.supporting_line()); if(!o) @@ -180,10 +180,10 @@ namespace CGAL { { typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; typedef std::vector< - typename boost::result_of::type> solutions_container; typedef std::pair Solution; - typedef typename boost::result_of< + typedef typename cpp11::result_of< typename SK::Intersect_3(typename SK::Circle_3, typename SK::Line_arc_3)>::type result_type; solutions_container solutions; @@ -213,7 +213,7 @@ namespace CGAL { OutputIterator res) { typedef typename SK::Circular_arc_point_3 Circular_arc_point_3; - typedef std::vector::type > solutions_container; typedef std::pair Solution; @@ -248,7 +248,7 @@ namespace CGAL { *res++ = result_type(l); } const Point_3* sol; - typename boost::result_of + typename cpp11::result_of ::type o = SK().intersect_3_object()(p,l.supporting_line()); if(!o) diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h index f44553d1a7a..57c7ee82ddc 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h @@ -244,7 +244,7 @@ namespace CGAL { const typename SK::Line_3 & l, OutputIterator res) { - typedef typename boost::result_of + typedef typename cpp11::result_of ::type result_type; typedef typename SK::Algebraic_kernel Algebraic_kernel; typedef typename SK::Polynomial_for_spheres_2_3 Equation_sphere; @@ -280,7 +280,7 @@ namespace CGAL { typedef typename SK::Sphere_3 Sphere_3; typedef typename SK::Plane_3 Plane_3; typedef typename SK::Algebraic_kernel Algebraic_kernel; - typedef typename boost::result_of< + typedef typename cpp11::result_of< typename SK::Intersect_3(Sphere_3, Sphere_3, Sphere_3) >::type result_type; @@ -296,7 +296,7 @@ namespace CGAL { return res; } if(non_oriented_equal(s1,s2)) { - if(typename boost::result_of::type v = + if(typename cpp11::result_of::type v = SK().intersect_3_object()(s1, s3)) { #if CGAL_INTERSECTION_VERSION < 2 if( const Point_3* p = object_cast(&v) ) @@ -312,7 +312,7 @@ namespace CGAL { return res; } if(non_oriented_equal(s1,s3) || non_oriented_equal(s2,s3)) { - if(typename boost::result_of::type v = + if(typename cpp11::result_of::type v = SK().intersect_3_object()(s1, s2)) { #if CGAL_INTERSECTION_VERSION < 2 if( const Point_3* p = object_cast(&v) ) @@ -329,7 +329,7 @@ namespace CGAL { return res; } if(SK().collinear_3_object()(s1.center(),s2.center(),s3.center())) { - typename boost::result_of::type v = + typename cpp11::result_of::type v = SK().intersect_3_object()(s1, s2); if(!v) return res; if(const Point_3* p = CGAL::internal::intersect_get(v)) { @@ -385,7 +385,7 @@ namespace CGAL { CGAL_kernel_precondition(!s1.is_degenerate()); CGAL_kernel_precondition(!s2.is_degenerate()); if(non_oriented_equal(s1,s2)) { - if(typename boost::result_of::type v = + if(typename cpp11::result_of::type v = SK().intersect_3_object()(p, s1)) { #if CGAL_INTERSECTION_VERSION < 2 if( const typename SK::Point_3* p = CGAL::object_cast(&v) ) @@ -403,7 +403,7 @@ namespace CGAL { } Plane_3 radical_p = SK().construct_radical_plane_3_object()(s1,s2); if(non_oriented_equal(p,radical_p)) { - if(typename boost::result_of::type v = + if(typename cpp11::result_of::type v = SK().intersect_3_object()(p, s1)) { #if CGAL_INTERSECTION_VERSION < 2 if( const typename SK::Point_3* p = CGAL::object_cast(&v) ) @@ -449,7 +449,7 @@ namespace CGAL { CGAL_kernel_precondition(!p2.is_degenerate()); CGAL_kernel_precondition(!s.is_degenerate()); if(non_oriented_equal(p1,p2)) { - if(typename boost::result_of::type v = + if(typename cpp11::result_of::type v = SK().intersect_3_object()(p1, s)) { #if CGAL_INTERSECTION_VERSION < 2 if( const typename SK::Point_3* p = CGAL::object_cast(&v) ) @@ -505,7 +505,7 @@ namespace CGAL { typedef typename SK::Algebraic_kernel Algebraic_kernel; typedef typename SK::Circle_3 Circle_3; - typedef typename boost::result_of + typedef typename cpp11::result_of ::type result_type; if(non_oriented_equal(c1,c2)) { @@ -533,7 +533,7 @@ namespace CGAL { typedef typename SK::Polynomials_for_line_3 Equation_line; typedef typename SK::Circle_3 Circle_3; - typedef typename boost::result_of + typedef typename cpp11::result_of ::type result_type; typedef typename SK::Algebraic_kernel Algebraic_kernel; diff --git a/Filtered_kernel/include/CGAL/Lazy.h b/Filtered_kernel/include/CGAL/Lazy.h index 350c41c8c57..6ee59e8ee33 100644 --- a/Filtered_kernel/include/CGAL/Lazy.h +++ b/Filtered_kernel/include/CGAL/Lazy.h @@ -1477,13 +1477,13 @@ struct Lazy_construction_variant { typedef typename LK::E2A E2A; template - typename boost::result_of::type + typename cpp11::result_of::type operator()(const L1& l1, const L2& l2) const { - typedef typename boost::result_of::type result_type; + typedef typename cpp11::result_of::type result_type; - typedef typename boost::result_of::type, + typedef typename cpp11::result_of::type, typename Type_mapper::type)>::type AT; - typedef typename boost::result_of::type, + typedef typename cpp11::result_of::type, typename Type_mapper::type)>::type ET; CGAL_BRANCH_PROFILER(std::string(" failures/calls to : ") + std::string(CGAL_PRETTY_FUNCTION), tmp); @@ -1525,14 +1525,14 @@ struct Lazy_construction_variant { } template - typename boost::result_of::type + typename cpp11::result_of::type operator()(const L1& l1, const L2& l2, const L3& l3) const { - typedef typename boost::result_of::type result_type; + typedef typename cpp11::result_of::type result_type; - typedef typename boost::result_of::type, + typedef typename cpp11::result_of::type, typename Type_mapper::type, typename Type_mapper::type)>::type AT; - typedef typename boost::result_of::type, + typedef typename cpp11::result_of::type, typename Type_mapper::type, typename Type_mapper::type)>::type ET; @@ -1582,7 +1582,7 @@ struct Lazy_construction_variant { struct result { \ BOOST_PP_REPEAT(n, CGAL_TYPEMAP_AC, T) \ typedef typename Type_mapper< \ - typename boost::result_of::type, AK, LK>::type type; \ + typename cpp11::result_of::type, AK, LK>::type type; \ }; BOOST_PP_REPEAT_FROM_TO(1, 9, CGAL_RESULT, _) diff --git a/Intersections_2/include/CGAL/Intersection_traits.h b/Intersections_2/include/CGAL/Intersection_traits.h index c98fbf08c0e..a532a6862e6 100644 --- a/Intersections_2/include/CGAL/Intersection_traits.h +++ b/Intersections_2/include/CGAL/Intersection_traits.h @@ -69,13 +69,13 @@ #define CGAL_INTERSECTION_FUNCTION(A, B, DIM) \ template \ inline \ - typename boost::result_of::type \ + typename cpp11::result_of::type \ intersection(const A& a, const B& b) { \ return BOOST_PP_CAT(K().intersect_, BOOST_PP_CAT(DIM, _object()(a, b))); \ } \ template \ inline \ - typename boost::result_of::type \ + typename cpp11::result_of::type \ intersection(const B& a, const A& b) { \ return BOOST_PP_CAT(K().intersect_, BOOST_PP_CAT(DIM, _object()(a, b))); \ } @@ -83,7 +83,7 @@ #define CGAL_INTERSECTION_FUNCTION_SELF(A, DIM) \ template \ inline \ - typename boost::result_of::type \ + typename cpp11::result_of::type \ intersection(const A & a, const A & b) { \ return BOOST_PP_CAT(K().intersect_, BOOST_PP_CAT(DIM, _object()(a, b))); \ } @@ -167,16 +167,16 @@ namespace internal { #else #if defined(CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE) template - inline typename boost::result_of::type - intersection_return(const T& t) { return typename boost::result_of::type(t); } + inline typename cpp11::result_of::type + intersection_return(const T& t) { return typename cpp11::result_of::type(t); } #else template - inline typename boost::result_of::type - intersection_return(T&& t) { return typename boost::result_of::type(std::forward(t)); } + inline typename cpp11::result_of::type + intersection_return(T&& t) { return typename cpp11::result_of::type(std::forward(t)); } #endif // CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE template - inline typename boost::result_of::type - intersection_return() { return typename boost::result_of::type(); } + inline typename cpp11::result_of::type + intersection_return() { return typename cpp11::result_of::type(); } #endif // CGAL_INTERSECTION_VERSION < 2 // Something similar to wrap around boost::get and object_cast to @@ -203,14 +203,14 @@ const T* intersect_get(const boost::variant & v) { } template -typename boost::result_of::Kernel::Intersect_2(A, B)>::type +typename cpp11::result_of::Kernel::Intersect_2(A, B)>::type intersection_impl(const A& a, const B& b, CGAL::Dimension_tag<2>) { typedef typename CGAL::Kernel_traits::Kernel Kernel; return Kernel().intersect_2_object()(a, b); } template -typename boost::result_of::Kernel::Intersect_3(A, B)>::type +typename cpp11::result_of::Kernel::Intersect_3(A, B)>::type intersection_impl(const A& a, const B& b, Dimension_tag<3>) { typedef typename CGAL::Kernel_traits::Kernel Kernel; return Kernel().intersect_3_object()(a, b); diff --git a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h index 18bf1d23296..a797e493a3a 100644 --- a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h +++ b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h @@ -37,7 +37,7 @@ inline #if CGAL_INTERSECTION_VERSION < 2 CGAL::Object #else -typename boost::result_of::type +typename cpp11::result_of::type #endif intersection(const Plane_3 &plane1, const Plane_3 &plane2, const Plane_3 &plane3) @@ -84,7 +84,7 @@ CGAL_INTERSECTION_FUNCTION(Plane_3, Triangle_3, 3) template inline typename -boost::result_of::type +cpp11::result_of::type intersection(const Line_3 &a, const Bbox_3 &b) { return K().intersect_3_object()(a, b); @@ -92,7 +92,7 @@ intersection(const Line_3 &a, template inline typename -boost::result_of::type +cpp11::result_of::type intersection(const Bbox_3 &a, const Line_3 &b) { return K().intersect_3_object()(a, b); @@ -100,7 +100,7 @@ intersection(const Bbox_3 &a, template inline typename -boost::result_of::type +cpp11::result_of::type intersection(const Ray_3 &a, const Bbox_3 &b) { return K().intersect_3_object()(a, b); @@ -108,7 +108,7 @@ intersection(const Ray_3 &a, template inline typename -boost::result_of::type +cpp11::result_of::type intersection(const Bbox_3 &a, const Ray_3 &b) { return K().intersect_3_object()(a, b); @@ -116,7 +116,7 @@ intersection(const Bbox_3 &a, template inline typename -boost::result_of::type +cpp11::result_of::type intersection(const Segment_3 &a, const Bbox_3 &b) { return K().intersect_3_object()(a, b); @@ -124,7 +124,7 @@ intersection(const Segment_3 &a, template inline typename -boost::result_of::type +cpp11::result_of::type intersection(const Bbox_3 &a, const Segment_3 &b) { return K().intersect_3_object()(a, b); diff --git a/Intersections_3/test/Intersections_3/call_test.cpp b/Intersections_3/test/Intersections_3/call_test.cpp index a46fb3b99ec..e4cd89e6f1e 100644 --- a/Intersections_3/test/Intersections_3/call_test.cpp +++ b/Intersections_3/test/Intersections_3/call_test.cpp @@ -26,9 +26,9 @@ typedef CGAL::Bbox_3 Bbox_3; template void call_intersection_global(const A& a, const B& b) { - typename boost::result_of::type x = CGAL::intersection(a, b); - typename boost::result_of::type y = CGAL::intersection(b, a); - typename boost::result_of::type z = CGAL::intersection(b, a); + typename cpp11::result_of::type x = CGAL::intersection(a, b); + typename cpp11::result_of::type y = CGAL::intersection(b, a); + typename cpp11::result_of::type z = CGAL::intersection(b, a); CGAL_USE(x); CGAL_USE(y); CGAL_USE(z); @@ -43,8 +43,8 @@ void call_do_intersect_global(const A& a, const B& b) { template void call_intersection_with_kernel(const A& a, const B& b, const K&) { typedef typename K::Intersect_3 Intersect; - typename boost::result_of::type x = Intersect()(a, b); - typename boost::result_of::type y = Intersect()(b, a); + typename cpp11::result_of::type x = Intersect()(a, b); + typename cpp11::result_of::type y = Intersect()(b, a); } template @@ -80,7 +80,7 @@ int main() // call_intersection_global(Pl(), Cub()); // special - boost::result_of::type plplpl = CGAL::intersection(Pl(), Pl(), Pl()); + cpp11::result_of::type plplpl = CGAL::intersection(Pl(), Pl(), Pl()); call_intersection_global(Tr(), S()); call_intersection_global(Tr(), L()); diff --git a/Kernel_23/doc/Kernel_23/CGAL/Circular_kernel_intersections.h b/Kernel_23/doc/Kernel_23/CGAL/Circular_kernel_intersections.h index 587ae14a737..3d69f9c2e9c 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Circular_kernel_intersections.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Circular_kernel_intersections.h @@ -48,7 +48,7 @@ with `Dispatch_output_iterator`. Since both the number of intersections, if any, and their types, depend on the arguments, the function expects an output iterator on -`boost::result_of::%type`, as +`cpp11::result_of::%type`, as presented below. */ diff --git a/Kernel_23/doc/Kernel_23/CGAL/Spherical_kernel_intersections.h b/Kernel_23/doc/Kernel_23/CGAL/Spherical_kernel_intersections.h index e921de81bd8..5c84be956d2 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Spherical_kernel_intersections.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Spherical_kernel_intersections.h @@ -59,7 +59,7 @@ with `Dispatch_output_iterator`. Since both the number of intersections, if any, and their types, depend on the arguments, the function expects an output iterator on -`boost::result_of::%type`, +`cpp11::result_of::%type`, as presented below. */ /// @{ diff --git a/Kernel_23/doc/Kernel_23/CGAL/intersections.h b/Kernel_23/doc/Kernel_23/CGAL/intersections.h index 678251302f0..8004dc725b2 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/intersections.h +++ b/Kernel_23/doc/Kernel_23/CGAL/intersections.h @@ -133,8 +133,8 @@ depending on the arguments. The following table gives the possible values for `Type1` and `Type2` and the resulting return types `T...` in `boost::optional< boost::variant< T... > >`. The resulting return type can be obtained through -`boost::result_of::%type` or -`boost::result_of::%type`. +`cpp11::result_of::%type` or +`cpp11::result_of::%type`.
@@ -340,7 +340,7 @@ void foo(const Segment_2& seg, const Line_2& lin) // auto result = intersection(seg, lin); // without C++11 - boost::result_of, Line_2)>::type + cpp11::result_of, Line_2)>::type result = intersection(seg, lin); if(result) { boost::apply_visitor(Intersection_visitor(), *result); } @@ -368,7 +368,7 @@ a standard library algorithm. */ template -boost::result_of::type +cpp11::result_of::type intersection(Type1 obj1, Type2 obj2); /*! diff --git a/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h b/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h index c8860968556..3f14a30325d 100644 --- a/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h +++ b/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h @@ -7639,7 +7639,7 @@ public: \cgalRefines `AdaptableFunctor` (with two arguments) \sa `CGAL::intersection` - \sa `boost::result_of` + \sa `cpp11::result_of` */ class Intersect_2 { @@ -7654,7 +7654,7 @@ public: `Type1` and `Type2`, for all pairs `Type1` and `Type2`. For details see the reference manual page for `intersection()`. */ - boost::result_of::type + cpp11::result_of::type operator()(Type1 obj1, Type2 obj2); /// @} @@ -7668,7 +7668,7 @@ public: \cgalRefines `AdaptableFunctor` (with two or three arguments) \sa `CGAL::intersection` - \sa `boost::result_of` + \sa `cpp11::result_of` */ class Intersect_3 { @@ -7683,7 +7683,7 @@ public: objects of type `Type1` and `Type2`. For details see the reference manual page for `intersection()`. */ - boost::result_of::type + cpp11::result_of::type operator()(Type1 obj1, Type2 obj2); diff --git a/Kernel_23/doc/Kernel_23/Kernel_23.txt b/Kernel_23/doc/Kernel_23/Kernel_23.txt index 900db5218a0..b9022f52fac 100644 --- a/Kernel_23/doc/Kernel_23/Kernel_23.txt +++ b/Kernel_23/doc/Kernel_23/Kernel_23.txt @@ -493,11 +493,11 @@ in a type-safe way \cgal uses return values of type `boost::optional< boost::variant< T \ldots\ > >` were `T...` is a list of all possible resulting geometric objects. The exact result type of an intersection can be determined through the metafunction -`boost::result_of` or -`boost::result_of`, where +`cpp11::result_of` or +`cpp11::result_of`, where `Type1` and `Type2` are the types of the objects used in the intersection computation. See -`boost::result_of` +`cpp11::result_of` for more details about this mechanism. @@ -523,7 +523,7 @@ std::cin >> segment_1 >> segment_2; // auto v = intersection(segment_1, segment_2); /* C++03 */ -boost::result_of::type +cpp11::result_of::type v = intersection(segment_1, segment_2); if(v) { /* not empty */ diff --git a/Kernel_23/doc_tex/Kernel_23/predicates_constructions.tex b/Kernel_23/doc_tex/Kernel_23/predicates_constructions.tex index 723076a4c9f..79ca4c5e306 100644 --- a/Kernel_23/doc_tex/Kernel_23/predicates_constructions.tex +++ b/Kernel_23/doc_tex/Kernel_23/predicates_constructions.tex @@ -68,8 +68,8 @@ in a type safe way {\cgal} uses return values of type \ccStyle{boost::optional< boost::variant< T \ldots\ > >} were T... is a list of all possible resulting geometric objects. The exact result type of an intersection can be determined through the metafunction -\ccc{boost::result_of} or -\ccc{boost::result_of}, where +\ccc{cpp11::result_of} or +\ccc{cpp11::result_of}, where \ccc{Type1} and \ccc{Type2} are the types of the objects used in the intersection computation. See \ccAnchor{http://www.boost.org/libs/utility/utility.htm#result_of}{boost::result\_of} @@ -95,7 +95,7 @@ value for the \ccHtmlNoLinksFrom{intersection} computation: auto v = intersection(segment_1, segment_2); /* C++03 */ - /*boost::result_of::type */ + /*cpp11::result_of::type */ /* v = intersection(segment_1, segment_2); */ if(v) { /* not empty */ diff --git a/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_2.tex b/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_2.tex index 8b5de44664a..5923f88e798 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_2.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_2.tex @@ -4,7 +4,7 @@ A model for this must provide \ccCreationVariable{fo} \ccMemberFunction{typename - boost::result_of::type operator()(Type1 obj1, Type2 obj2);} + cpp11::result_of::type operator()(Type1 obj1, Type2 obj2);} {computes the \ccHtmlNoLinksFrom{intersection} region of two geometrical objects of type \ccStyle{Type1} and \ccStyle{Type2}} diff --git a/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_3.tex b/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_3.tex index 583c3dc9891..52fe77ff59c 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_3.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/Kernel_Intersect_3.tex @@ -3,10 +3,10 @@ A model for this must provide \ccCreationVariable{fo} -\ccMemberFunction{boost::result_of::type operator()(Type1 obj1, Type2 obj2);} +\ccMemberFunction{cpp11::result_of::type operator()(Type1 obj1, Type2 obj2);} {computes the \ccHtmlNoLinksFrom{intersection} region of \ccStyle{obj1} and \ccStyle{obj2}} -\ccMemberFunction{boost::result_of::type operator()( +\ccMemberFunction{cpp11::result_of::type operator()( Plane_3 p1, Plane_3 p2, Plane_3 p3);} {computes the \ccHtmlNoLinksFrom{intersection} region of \ccStyle{p1}, \ccStyle{p2} and \ccStyle{p3}} diff --git a/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex b/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex index 5a2f3ce876c..b1a394c8be2 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/intersection.tex @@ -22,7 +22,7 @@ the macro \ccc{CGAL_INTERSECTION_VERSION} must be defined to \ccUnchecked{ \ccRefLabel{Kernel::intersection} -\ccFunction{boost::result_of::type intersection(Type1 obj1, Type2 obj2);} +\ccFunction{cpp11::result_of::type intersection(Type1 obj1, Type2 obj2);} {Two objects \ccStyle{obj1} and \ccStyle{obj2} intersect if there is a point \ccStyle{p} that is part of both \ccStyle{obj1} and \ccStyle{obj2}. The \ccHtmlNoLinksFrom{intersection} region of those two objects is defined as the set of all @@ -40,8 +40,8 @@ The same functionality is also available through the functors The possible values for types \ccStyle{Type1} and \ccStyle{Type2} and the value for T\ldots in \ccStyle{boost::optional< boost::variant< T\ldots > >} are the following and can be obtained through -\ccStyle{boost::result_of(Intersect_2(A, B)>::type} or -\ccStyle{boost::result_of(Intersect_3(A, B)>::type}. +\ccStyle{cpp11::result_of(Intersect_2(A, B)>::type} or +\ccStyle{cpp11::result_of(Intersect_3(A, B)>::type}. \begin{ccTexOnly} \begin{longtable}[c]{|l|l|l|} @@ -534,7 +534,7 @@ with \ccc{CGAL::Dispatch_output_iterator}. Since both the number of intersections, if any, and their type, depend on the arguments, the function expects an output iterator on -\ccStyle{boost::result_of::type}, as +\ccStyle{cpp11::result_of::type}, as presented below. \ccFunction{template < class OutputIterator > @@ -582,7 +582,7 @@ with \ccc{CGAL::Dispatch_output_iterator}. Since both the number of intersections, if any, and their type, depend on the arguments, the functions expects an output iterator on -\ccStyle{boost::result_of::type}, +\ccStyle{cpp11::result_of::type}, as presented below. The \textbf{first function} is: @@ -676,7 +676,7 @@ void foo(const Segment_2& seg, const Line_2& lin) auto result = intersection(seg, lin); // without C++11 - // boost::result_of, Line_2)>::type + // cpp11::result_of, Line_2)>::type // result = intersection(seg, lin); if(result) { boost::apply_visitor(Intersection_visitor(), *result); } diff --git a/Kernel_23/examples/Kernel_23/MyKernel.cpp b/Kernel_23/examples/Kernel_23/MyKernel.cpp index 59fb4d23451..1c5ba9f03f7 100644 --- a/Kernel_23/examples/Kernel_23/MyKernel.cpp +++ b/Kernel_23/examples/Kernel_23/MyKernel.cpp @@ -56,7 +56,7 @@ int main() K::Intersect_2 intersection; - boost::result_of::type + cpp11::result_of::type intersect = intersection(s1, s2); K::Construct_cartesian_const_iterator_2 construct_it; diff --git a/Kernel_23/examples/Kernel_23/cartesian_converter.cpp b/Kernel_23/examples/Kernel_23/cartesian_converter.cpp index 38b80012979..a22ed405f26 100644 --- a/Kernel_23/examples/Kernel_23/cartesian_converter.cpp +++ b/Kernel_23/examples/Kernel_23/cartesian_converter.cpp @@ -25,7 +25,7 @@ int main(){ EK::Triangle_3 t2=to_exact(t1); EK::Line_3 l2=to_exact(l1); - boost::result_of::type + cpp11::result_of::type inter = CGAL::intersection(t2,l2); // As we are sure that there IS an intersection diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h index 36ca4dc5167..ae40297bbd3 100644 --- a/Kernel_23/include/CGAL/Kernel/function_objects.h +++ b/Kernel_23/include/CGAL/Kernel/function_objects.h @@ -2539,7 +2539,7 @@ namespace CommonKernelFunctors { // 25 possibilities, so I keep the template. template - typename boost::result_of< Intersect_2(T1, T2) >::type + typename cpp11::result_of< Intersect_2(T1, T2) >::type operator()(const T1& t1, const T2& t2) const { return internal::intersection(t1, t2, K()); } }; @@ -2572,7 +2572,7 @@ namespace CommonKernelFunctors { // n possibilities, so I keep the template. template - typename boost::result_of< Intersect_3(T1, T2) >::type + typename cpp11::result_of< Intersect_3(T1, T2) >::type operator()(const T1& t1, const T2& t2) const { return internal::intersection(t1, t2, K() ); } diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_Result_of_kernel.h b/Kernel_23/test/Kernel_23/include/CGAL/_Result_of_kernel.h index 5db88be1883..77ecce2b662 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_Result_of_kernel.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_Result_of_kernel.h @@ -46,7 +46,7 @@ // Unfortunately this test is only an approximation. At this point -// boost::result_of behaves as C++11 result_of and we cannot force it +// cpp11::result_of behaves as C++11 result_of and we cannot force it // back into an old mode thanks to the include guards. We instead use // a TR1 implementation of result_of to compare the types. This is the // best we can go for. @@ -82,7 +82,7 @@ namespace CGAL { // This functor can wrap any DefaultConstructible functor. Iff there // is a result_type typedef it needs to be forwarded. In all other - // cases boost::result_of is necessary to determine the return type. + // cases cpp11::result_of is necessary to determine the return type. template::value > struct AnyFunctor; @@ -98,7 +98,7 @@ namespace CGAL { typedef typename F::result_type c03_return_type; static_assert((result_of_kernel::Rep_equal::value), - "Type difference between actual return type and boost::result_of<>::type"); + "Type difference between actual return type and cpp11::result_of<>::type"); return f(std::forward(args)...); } @@ -111,7 +111,7 @@ namespace CGAL { template struct result { - typedef typename boost::result_of::type type; + typedef typename cpp11::result_of::type type; }; // same as above @@ -130,7 +130,7 @@ namespace CGAL { )>::type c03_return_type; static_assert((result_of_kernel::Rep_equal::value), - "Type difference between actual return type and boost::result_of<>::type"); + "Type difference between actual return type and cpp11::result_of<>::type"); return f(std::forward(args)...); } diff --git a/Kernel_d/doc/Kernel_d/CGAL/intersections_d.h b/Kernel_d/doc/Kernel_d/CGAL/intersections_d.h index 8fbc19620aa..75777d40a85 100644 --- a/Kernel_d/doc/Kernel_d/CGAL/intersections_d.h +++ b/Kernel_d/doc/Kernel_d/CGAL/intersections_d.h @@ -36,7 +36,7 @@ The following table gives the possible values for `Type1` and `Type2` and the resulting return types `T...` in `boost::optional< boost::variant< T... > >`. The resulting return type can be obtained through -`boost::result_of(Kernel::Intersect_d(A, B)>::type`. +`cpp11::result_of(Kernel::Intersect_d(A, B)>::type`.
@@ -146,7 +146,7 @@ void foo(Segment_d seg, Line_d lin) // auto result = intersection(seg, lin); // without C++11 support - typename boost::result_of, Line_d)>::type + typename cpp11::result_of, Line_d)>::type result = intersection(seg, lin); if(result) { boost::apply_visitor(Intersection_visitor(), *result); } @@ -160,7 +160,7 @@ void foo(Segment_d seg, Line_d lin) \sa CGAL_INTERSECTION_VERSION \sa `boost::optional` \sa `boost::variant` -\sa `boost::result_of` +\sa `cpp11::result_of` */ Object intersection(Type1 f1, Type2 f2); diff --git a/Kernel_d/doc/Kernel_d/Concepts/Kernel--Intersect_d.h b/Kernel_d/doc/Kernel_d/Concepts/Kernel--Intersect_d.h index ce3f411690f..bafaae73642 100644 --- a/Kernel_d/doc/Kernel_d/Concepts/Kernel--Intersect_d.h +++ b/Kernel_d/doc/Kernel_d/Concepts/Kernel--Intersect_d.h @@ -21,7 +21,7 @@ For a list of the possible return types, see `CGAL::intersection()`. \pre `p` and `q` have the same dimension. */ template -boost::result_of::type +cpp11::result_of::type operator()(const Type1& p, const Type2& q); diff --git a/Kernel_d/doc/Kernel_d/Kernel_d.txt b/Kernel_d/doc/Kernel_d/Kernel_d.txt index 59ddee558b3..87b634ee41c 100644 --- a/Kernel_d/doc/Kernel_d/Kernel_d.txt +++ b/Kernel_d/doc/Kernel_d/Kernel_d.txt @@ -439,10 +439,10 @@ returns a `boost::optional< boost::variant< T... > >` where `T...` is a list of all possible resulting geometric objects. The exact result type of an intersection can be determined by using -`boost::result_of::type` +`cpp11::result_of::type` `where `Type1` and `Type2` are the types of the objects used in the intersection query. See -`boost::result_of` +`cpp11::result_of` for more information about this mechanism. @@ -459,7 +459,7 @@ typedef Segment_d Segment; Segment s1, s2; std::cin >> s1 >> s2; -boost::result_of::type +cpp11::result_of::type v = intersection(s1, s2); if(v) { // not empty diff --git a/Kernel_d/doc_tex/Kernel_d/predicates_constructions_d.tex b/Kernel_d/doc_tex/Kernel_d/predicates_constructions_d.tex index 17963b6f876..27d7939e99c 100644 --- a/Kernel_d/doc_tex/Kernel_d/predicates_constructions_d.tex +++ b/Kernel_d/doc_tex/Kernel_d/predicates_constructions_d.tex @@ -68,7 +68,7 @@ returns a \ccStyle{boost::optional< boost::variant< T \ldots\ > >} were T\textellipsis\ is a list of all possible resulting geometric objects. The exact result type of an intersection can be determined by using -\ccStyle{boost::result_of::type} +\ccStyle{cpp11::result_of::type} where \ccStyle{Type1} and \ccStyle{Type2} are the types of the objects used in the intersection query. See \ccAnchor{http://www.boost.org/libs/utility/utility.htm#result_of}{boost::result\_of} @@ -83,7 +83,7 @@ for more information about this mechanism. Segment s1, s2; std::cin >> s1 >> s2; - boost::result_of::type + cpp11::result_of::type v = intersection(s1, s2); if(v) { /* not empty */ diff --git a/Kernel_d/doc_tex/Kernel_d_ref/Kernel_Intersect_d.tex b/Kernel_d/doc_tex/Kernel_d_ref/Kernel_Intersect_d.tex index d7f2199bce3..f9d28baca6d 100644 --- a/Kernel_d/doc_tex/Kernel_d_ref/Kernel_Intersect_d.tex +++ b/Kernel_d/doc_tex/Kernel_d_ref/Kernel_Intersect_d.tex @@ -3,7 +3,7 @@ A model for this must provide: \ccCreationVariable{fo} -\ccMemberFunction{boost::result_of, Type2)>::type operator()(const Type1& p, const Type2& q);} +\ccMemberFunction{cpp11::result_of, Type2)>::type operator()(const Type1& p, const Type2& q);} {returns the result of the intersection of $p$ and $q$ in form of a polymorphic object. \ccc{Kernel_object} may be any of \ccc{Kernel::Segment_d}, \ccc{Kernel::Ray_d}, \ccc{Kernel::Line_d}, diff --git a/Kernel_d/doc_tex/Kernel_d_ref/intersection.tex b/Kernel_d/doc_tex/Kernel_d_ref/intersection.tex index 34352648e10..5af9a16bb82 100644 --- a/Kernel_d/doc_tex/Kernel_d_ref/intersection.tex +++ b/Kernel_d/doc_tex/Kernel_d_ref/intersection.tex @@ -166,7 +166,7 @@ void foo(Segment_d seg, Line_d lin) auto result = intersection(seg, lin); // without C++11 support - // typename boost::result_of, Line_d)>::type + // typename cpp11::result_of, Line_d)>::type // result = intersection(seg, lin); if(result) { boost::apply_visitor(Intersection_visitor(), *result); } diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objects.h b/Kernel_d/include/CGAL/Kernel_d/function_objects.h index 5447a47ce1e..2b552dc03c5 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objects.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objects.h @@ -215,7 +215,7 @@ public: #endif template - typename boost::result_of::type + typename cpp11::result_of::type operator()(const T1& t1, const T2& t2) const { return internal::intersection(t1, t2, R()); } }; diff --git a/Kernel_d/include/CGAL/intersections_d.h b/Kernel_d/include/CGAL/intersections_d.h index 44bbb86f71f..d47c000e331 100644 --- a/Kernel_d/include/CGAL/intersections_d.h +++ b/Kernel_d/include/CGAL/intersections_d.h @@ -32,7 +32,7 @@ namespace CGAL { namespace internal { template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Line_d& l1, const typename R::Line_d& l2, const R&) { typedef typename R::Line_d_Line_d_pair ll_pair; @@ -53,7 +53,7 @@ intersection(const typename R::Line_d& l1, const typename R::Line_d& l2, const R } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Ray_d& l1, const typename R::Ray_d& l2, const R&) { typedef typename R::Ray_d_Ray_d_pair ll_pair; @@ -82,7 +82,7 @@ intersection(const typename R::Ray_d& l1, const typename R::Ray_d& l2, const R&) } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Segment_d& l1, const typename R::Segment_d& l2, const R&) { typedef typename R::Segment_d_Segment_d_pair ll_pair; @@ -106,7 +106,7 @@ intersection(const typename R::Segment_d& l1, const typename R::Segment_d& l2, c } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Line_d& l, const typename R::Ray_d& r, const R&) { typedef typename R::Line_d_Ray_d_pair lr_pair; @@ -128,12 +128,12 @@ intersection(const typename R::Line_d& l, const typename R::Ray_d& r, const R&) } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Ray_d& r, const typename R::Line_d& l, const R& k) { return intersection(l,r,k); } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Ray_d& r, const typename R::Segment_d& s, const R&) { typedef typename R::Ray_d_Segment_d_pair rs_pair; @@ -157,12 +157,12 @@ intersection(const typename R::Ray_d& r, const typename R::Segment_d& s, const R } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Segment_d& s, const typename R::Ray_d& r, const R& k) { return intersection(r,s, k); } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Line_d& l, const typename R::Segment_d& s, const R&) { typedef typename R::Line_d_Segment_d_pair rs_pair; @@ -186,12 +186,12 @@ intersection(const typename R::Line_d& l, const typename R::Segment_d& s, const } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Segment_d& s, const typename R::Line_d& l, const R& r) { return intersection(l,s,r); } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Line_d& l, const typename R::Hyperplane_d& h, const R&) { typedef typename R::Line_d_Hyperplane_d_pair lh_pair; @@ -212,12 +212,12 @@ intersection(const typename R::Line_d& l, const typename R::Hyperplane_d& h, con } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Hyperplane_d& h, const typename R::Line_d& l, const R& r) { return intersection(l,h,r); } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Ray_d& r, const typename R::Hyperplane_d& h, const R&) { typedef typename R::Ray_d_Hyperplane_d_pair rh_pair; @@ -238,12 +238,12 @@ intersection(const typename R::Ray_d& r, const typename R::Hyperplane_d& h, cons } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Hyperplane_d& h, const typename R::Ray_d& r, const R& k) { return intersection(r,h,k); } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Segment_d& s, const typename R::Hyperplane_d& h, const R&) { typedef typename R::Segment_d_Hyperplane_d_pair sh_pair; @@ -265,7 +265,7 @@ intersection(const typename R::Segment_d& s, const typename R::Hyperplane_d& h, } template -typename boost::result_of::type +typename cpp11::result_of::type intersection(const typename R::Hyperplane_d& h, const typename R::Segment_d& s, const R& r) { return intersection(s,h,r); } diff --git a/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h index 94ed7574f35..cf2fbdafdc3 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h @@ -201,7 +201,7 @@ public: template Surface_patch clip_to_segment(const Query& query) const { - typename boost::result_of::type + typename cpp11::result_of::type clipped = CGAL::intersection(query, r_domain_.bbox_); if(clipped) @@ -324,7 +324,7 @@ public: template Intersection clip_to_segment(const Query& query) const { - typename boost::result_of::type + typename cpp11::result_of::type clipped = CGAL::intersection(query, r_domain_.bbox_); if(clipped) diff --git a/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h b/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h index c00f358d22c..45ee342f484 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h @@ -50,7 +50,7 @@ public: template struct result { - typedef typename boost::result_of::type type; + typedef typename cpp11::result_of::type type; }; typedef Exact_predicates_exact_constructions_kernel EK; @@ -58,7 +58,7 @@ public: typedef Cartesian_converter Back_from_exact; template - typename boost::result_of::type + typename cpp11::result_of::type operator() (const T1& t, const T2& s) const { // Switch to exact @@ -67,7 +67,7 @@ public: EK::Intersect_3 exact_intersection = EK().intersect_3_object(); // Cartesian converters have an undocumented, optional< variant > operator - return typename boost::result_of::type + return typename cpp11::result_of::type (back_from_exact(exact_intersection(to_exact(t), to_exact(s)))); } };