import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / correct.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/correct.hpp b/ceph/src/boost/boost/geometry/algorithms/correct.hpp
index 21b9977ce54ea3e941973947057811311daf0d23..a3d068a2dccb93cd638d32546d3fdfb60fc20087 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/correct.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/correct.hpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 // Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2017.
-// Modifications copyright (c) 2017 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2020.
+// Modifications copyright (c) 2017-2020 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
@@ -24,9 +24,9 @@
 #include <cstddef>
 #include <functional>
 
-#include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
-#include <boost/type_traits/remove_reference.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/value_type.hpp>
 
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/static_visitor.hpp>
@@ -147,7 +147,13 @@ struct correct_ring
         typedef typename area_result<Ring, Strategy>::type area_result_type;
         Predicate<area_result_type> predicate;
         area_result_type const zero = 0;
-        if (predicate(ring_area_type::apply(r, strategy), zero))
+        if (predicate(ring_area_type::apply(r,
+                                            // TEMP - in the future (umbrella) strategy will be passed
+                                            geometry::strategies::area::services::strategy_converter
+                                                <
+                                                    Strategy
+                                                >::get(strategy)),
+                      zero))
         {
             std::reverse(boost::begin(r), boost::end(r));
         }