update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
index 22ed82bfe322778ec29ae545eae89a06cc6745f8..afceefe461afdd2b53d5b6ad81f16df3900ce28d 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2019, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -87,11 +87,11 @@ struct copy_points<PointOut, MultiPointIn, multi_point_tag>
 
 // action struct for difference/intersection
 template <typename PointOut, overlay_type OverlayType>
-struct action_selector_pl_pl
+struct action_selector_pl
 {};
 
 template <typename PointOut>
-struct action_selector_pl_pl<PointOut, overlay_intersection>
+struct action_selector_pl<PointOut, overlay_intersection>
 {
     template
     <
@@ -112,7 +112,7 @@ struct action_selector_pl_pl<PointOut, overlay_intersection>
 
 
 template <typename PointOut>
-struct action_selector_pl_pl<PointOut, overlay_difference>
+struct action_selector_pl<PointOut, overlay_difference>
 {
     template
     <
@@ -150,7 +150,7 @@ struct point_point_point
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
-        action_selector_pl_pl
+        action_selector_pl
             <
                 PointOut, OverlayType
             >::apply(point1,
@@ -190,7 +190,7 @@ struct multipoint_point_point
                  it = boost::begin(multipoint);
              it != boost::end(multipoint); ++it)
         {
-            action_selector_pl_pl
+            action_selector_pl
                 <
                     PointOut, OverlayType
                 >::apply(*it,
@@ -220,7 +220,7 @@ struct point_multipoint_point
                                        OutputIterator oit,
                                        Strategy const& strategy)
     {
-        typedef action_selector_pl_pl<PointOut, OverlayType> action;
+        typedef action_selector_pl<PointOut, OverlayType> action;
 
         for (typename boost::range_iterator<MultiPoint const>::type
                  it = boost::begin(multipoint);
@@ -283,7 +283,7 @@ struct multipoint_multipoint_point
             bool found = std::binary_search(points2.begin(), points2.end(),
                                             *it1, less);
 
-            action_selector_pl_pl
+            action_selector_pl
                 <
                     PointOut, OverlayType
                 >::apply(*it1, found, oit);