update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / libs / geometry / test / algorithms / detail / sections / sectionalize.cpp

diff --git a/ceph/src/boost/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp b/ceph/src/boost/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp
index 48047f6677c386523abcc251d4156c610fb505c9..3f464f1a0ea135828b851c7a2f17dc90ad047b5d 100644 (file)
--- a/ceph/src/boost/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp
+++ b/ceph/src/boost/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2020.
-// Modifications copyright (c) 2020, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2020-2021.
+// Modifications copyright (c) 2020-2021, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -45,34 +45,36 @@
 template <int DimensionCount, typename Geometry>
 void test_sectionalize_part()
 {
-    typedef typename bg::point_type<Geometry>::type point_type;
-    typedef bg::model::box<point_type> box_type;
+    using point_type = typename bg::point_type<Geometry>::type;
+    using box_type = bg::model::box<point_type>;
 
-    typedef bg::sections<box_type, DimensionCount> sections_type;
-    typedef typename boost::range_value<sections_type>::type section_type;
+    using sections_type = bg::sections<box_type, DimensionCount>;
+    using section_type = typename boost::range_value<sections_type>::type;
 
-    typedef std::integer_sequence<std::size_t, 0> dimension_list;
+    using dimension_list = std::integer_sequence<std::size_t, 0>;
 
-    typedef bg::detail::sectionalize::sectionalize_part
-        <
-            point_type, dimension_list
-        > sectionalize_part;
+    using sectionalize_part = bg::detail::sectionalize::sectionalize_part<dimension_list>;
 
     sections_type sections;
     section_type section;
 
-
     Geometry geometry;
     geometry.push_back(bg::make<point_type>(1, 1));
 
     bg::detail::no_rescale_policy rescale_policy;
+    typename bg::strategies::relate::services::default_strategy
+        <
+            Geometry, Geometry
+        >::type strategy;
 
     bg::ring_identifier ring_id;
-    sectionalize_part::apply(sections, geometry.begin(), geometry.end(), rescale_policy, ring_id, 10);
+    sectionalize_part::apply(sections, geometry.begin(), geometry.end(),
+                             rescale_policy, strategy, ring_id, 10);
     // There should not yet be anything generated, because it is only ONE point
 
     geometry.push_back(bg::make<point_type>(2, 2));
-    sectionalize_part::apply(sections, geometry.begin(), geometry.end(), rescale_policy, ring_id, 10);
+    sectionalize_part::apply(sections, geometry.begin(), geometry.end(),
+                             rescale_policy, strategy, ring_id, 10);
 }
 
 
@@ -85,9 +87,9 @@ void test_sectionalize(std::string const& caseid, G const& g, std::size_t sectio
 
     static const std::size_t dimension_count = bg::util::sequence_size<DimensionVector>::value;
 
-    typedef typename bg::point_type<G>::type point;
-    typedef bg::model::box<point> box;
-    typedef bg::sections<box, dimension_count> sections;
+    using point = typename bg::point_type<G>::type;
+    using box = bg::model::box<point>;
+    using sections= bg::sections<box, dimension_count>;
 
     sections s;
     bg::sectionalize<Reverse, DimensionVector>(g,
@@ -97,7 +99,7 @@ void test_sectionalize(std::string const& caseid, G const& g, std::size_t sectio
 
     // Check if sections are consecutive and consistent
     int previous_index = -1;
-    BOOST_FOREACH(typename sections::value_type const& sec, s)
+    for (typename sections::value_type const& sec : s)
     {
         if (sec.begin_index > 0)
         {
@@ -157,7 +159,7 @@ void test_sectionalize(std::string const& caseid, G const& g, std::size_t sectio
 
         std::ofstream svg(filename.str().c_str());
 
-        typedef typename bg::point_type<G>::type point_type;
+        using point_type = typename bg::point_type<G>::type;
         bg::svg_mapper<point_type> mapper(svg, 500, 500);
 
         mapper.add(g);
@@ -210,8 +212,8 @@ void test_sectionalize(std::string const& caseid, std::string const& wkt,
     G g;
     bg::read_wkt(wkt, g);
 
-    typedef std::integer_sequence<std::size_t, 0, 1> dim2;
-    typedef std::integer_sequence<std::size_t, 0> dim1;
+    using dim2 = std::integer_sequence<std::size_t, 0, 1>;
+    using dim1 = std::integer_sequence<std::size_t, 0>;
 
     test_sectionalize<dim2, Reverse>(caseid + "_d2", g, count2, s2, d2, max_count);
     test_sectionalize<dim1, Reverse>(caseid + "_d1", g, count1, s1, d1, max_count);
@@ -290,8 +292,7 @@ void test_all()
         5, "0..2|2..4|4..5|5..8|8..9", "+|DUP|+|DUP|.");
 
 
-    typedef bg::model::box<P> B;
-    test_sectionalize<B, false>("box2", "BOX(0 0,4 4)",
+    test_sectionalize<bg::model::box<P>, false>("box2", "BOX(0 0,4 4)",
             4, "0..1|1..2|2..3|3..4", ". +|+ .|. -|- .",
             4, "0..1|1..2|2..3|3..4", ".|+|.|-");
 
@@ -309,7 +310,7 @@ void test_all()
         31, "", "", 100);
 
     {
-        typedef std::integer_sequence<std::size_t, 1> only_y_dim;
+        using only_y_dim = std::integer_sequence<std::size_t, 1>;
         bg::model::polygon<P> pol;
         bg::read_wkt(vertical, pol);
         test_sectionalize<only_y_dim, false>("vertical_y", pol, 22, "", "", 100);
@@ -325,8 +326,8 @@ void test_all()
 
 void test_large_integers()
 {
-    typedef bg::model::point<int, 2, bg::cs::cartesian> int_point_type;
-    typedef bg::model::point<double, 2, bg::cs::cartesian> double_point_type;
+    using int_point_type = bg::model::point<int, 2, bg::cs::cartesian>;
+    using double_point_type = bg::model::point<double, 2, bg::cs::cartesian>;
 
     std::string const polygon_li = "POLYGON((1872000 528000,1872000 192000,1536119 192000,1536000 528000,1200000 528000,1200000 863880,1536000 863880,1872000 863880,1872000 528000))";
     bg::model::polygon<int_point_type> int_poly;
@@ -334,7 +335,7 @@ void test_large_integers()
     bg::read_wkt(polygon_li, int_poly);
     bg::read_wkt(polygon_li, double_poly);
 
-    typedef std::integer_sequence<std::size_t, 0> dimensions;
+    using dimensions = std::integer_sequence<std::size_t, 0>;
     bg::sections<bg::model::box<int_point_type>, 1> int_sections;
     bg::sections<bg::model::box<double_point_type>, 1> double_sections;