update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / geometry / strategies / envelope / cartesian.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/envelope/cartesian.hpp b/ceph/src/boost/boost/geometry/strategies/envelope/cartesian.hpp
index 2fee1ece0b5d860d3b740347557b4a2e78f78013..1e032e3f127ce002b3444e5db700d15cef463568 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/envelope/cartesian.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/envelope/cartesian.hpp
@@ -13,18 +13,16 @@
 
 #include <type_traits>
 
-#include <boost/geometry/strategy/cartesian/envelope.hpp>
+#include <boost/geometry/strategy/cartesian/envelope.hpp> // Not used, for backward compatibility
 #include <boost/geometry/strategy/cartesian/envelope_box.hpp>
-#include <boost/geometry/strategy/cartesian/envelope_point.hpp>
+#include <boost/geometry/strategy/cartesian/envelope_boxes.hpp>
 #include <boost/geometry/strategy/cartesian/envelope_multipoint.hpp>
+#include <boost/geometry/strategy/cartesian/envelope_point.hpp>
+#include <boost/geometry/strategy/cartesian/envelope_range.hpp>
 #include <boost/geometry/strategy/cartesian/envelope_segment.hpp>
 
-#include <boost/geometry/strategy/cartesian/expand_box.hpp> // TEMP
-#include <boost/geometry/strategy/cartesian/expand_point.hpp>
-#include <boost/geometry/strategy/cartesian/expand_segment.hpp> // TEMP
-
-#include <boost/geometry/strategies/detail.hpp>
 #include <boost/geometry/strategies/envelope/services.hpp>
+#include <boost/geometry/strategies/expand/cartesian.hpp>
 
 
 namespace boost { namespace geometry
@@ -34,63 +32,59 @@ namespace strategies { namespace envelope
 {
 
 template <typename CalculationType = void>
-struct cartesian : strategies::detail::cartesian_base
+struct cartesian
+    : strategies::expand::cartesian<CalculationType>
 {
     template <typename Geometry, typename Box>
     static auto envelope(Geometry const&, Box const&,
-                         typename util::enable_if_point_t<Geometry> * = nullptr)
+                         util::enable_if_point_t<Geometry> * = nullptr)
     {
         return strategy::envelope::cartesian_point();
     }
 
     template <typename Geometry, typename Box>
     static auto envelope(Geometry const&, Box const&,
-                         typename util::enable_if_multi_point_t<Geometry> * = nullptr)
+                         util::enable_if_multi_point_t<Geometry> * = nullptr)
     {
         return strategy::envelope::cartesian_multipoint();
     }
 
     template <typename Geometry, typename Box>
     static auto envelope(Geometry const&, Box const&,
-                         typename util::enable_if_box_t<Geometry> * = nullptr)
+                         util::enable_if_box_t<Geometry> * = nullptr)
     {
         return strategy::envelope::cartesian_box();
     }
 
     template <typename Geometry, typename Box>
     static auto envelope(Geometry const&, Box const&,
-                         typename util::enable_if_segment_t<Geometry> * = nullptr)
+                         util::enable_if_segment_t<Geometry> * = nullptr)
     {
         return strategy::envelope::cartesian_segment<CalculationType>();
     }
 
     template <typename Geometry, typename Box>
     static auto envelope(Geometry const&, Box const&,
-                         typename util::enable_if_polysegmental_t<Geometry> * = nullptr)
-    {
-        return strategy::envelope::cartesian<CalculationType>();
-    }
-
-    template <typename Box, typename Geometry>
-    static auto expand(Box const&, Geometry const&,
-                       typename util::enable_if_point_t<Geometry> * = nullptr)
+                         std::enable_if_t
+                            <
+                                util::is_linestring<Geometry>::value
+                             || util::is_ring<Geometry>::value
+                             || util::is_polygon<Geometry>::value
+                            > * = nullptr)
     {
-        return strategy::expand::cartesian_point();
+        return strategy::envelope::cartesian_range();
     }
 
-    // TEMP
-    template <typename Box, typename Geometry>
-    static auto expand(Box const&, Geometry const&,
-                       typename util::enable_if_box_t<Geometry> * = nullptr)
-    {
-        return strategy::expand::cartesian_box();
-    }
-
-    template <typename Box, typename Geometry>
-    static auto expand(Box const&, Geometry const&,
-                       typename util::enable_if_segment_t<Geometry> * = nullptr)
+    template <typename Geometry, typename Box>
+    static auto envelope(Geometry const&, Box const&,
+                         std::enable_if_t
+                            <
+                                util::is_multi_linestring<Geometry>::value
+                             || util::is_multi_polygon<Geometry>::value
+                             || util::is_geometry_collection<Geometry>::value
+                            > * = nullptr)
     {
-        return strategy::expand::cartesian_segment();
+        return strategy::envelope::cartesian_boxes();
     }
 };