update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / detail / multi_modify.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/multi_modify.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/multi_modify.hpp
index 9c2f180067b43cb70016daf1243cc2da54216f1e..58597ed6f3f46cbded730489bacf1e06242ac2a7 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/multi_modify.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/multi_modify.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2017-2020.
-// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017-2021.
+// Modifications copyright (c) 2017-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
@@ -32,27 +32,24 @@ namespace detail
 {
 
 
-template <typename MultiGeometry, typename Policy>
+template <typename Policy>
 struct multi_modify
 {
+    template <typename MultiGeometry>
     static inline void apply(MultiGeometry& multi)
     {
-        typedef typename boost::range_iterator<MultiGeometry>::type iterator_type;
-        for (iterator_type it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
+        auto const end = boost::end(multi);
+        for (auto it = boost::begin(multi); it != end; ++it)
         {
             Policy::apply(*it);
         }
     }
 
-    template <typename Strategy>
+    template <typename MultiGeometry, typename Strategy>
     static inline void apply(MultiGeometry& multi, Strategy const& strategy)
     {
-        typedef typename boost::range_iterator<MultiGeometry>::type iterator_type;
-        for (iterator_type it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
+        auto const end = boost::end(multi);
+        for (auto it = boost::begin(multi); it != end; ++it)
         {
             Policy::apply(*it, strategy);
         }