import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/linear_linear.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
index 21d079d95c931a7009979e6ae3daf9ced3e5857a..a6e66b03d4da39ba8590cd723489cb0362a0037c 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2019, Oracle and/or its affiliates.
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -139,18 +139,6 @@ protected:
         static bool const include_no_turn = false;
         static bool const include_degenerate = EnableDegenerateTurns;
         static bool const include_opposite = false;
-
-        template
-        <
-            typename Info,
-            typename Point1,
-            typename Point2,
-            typename IntersectionInfo
-        >
-        static inline void apply(Info& , Point1 const& , Point2 const& ,
-                                 IntersectionInfo const& )
-        {
-        }
     };
 
 
@@ -181,8 +169,7 @@ protected:
                     LinearGeometry1,
                     LinearGeometry2,
                     assign_policy
-                >,
-                RobustPolicy
+                >
             >::apply(turns, linear1, linear2, interrupt_policy, strategy, robust_policy);
     }
 
@@ -249,13 +236,12 @@ public:
                 Linear1,
                 Linear2,
                 detail::get_turns::get_turn_info_type
-                <
-                    Linear1,
-                    Linear2,
-                    assign_policy
-                >,
-                RobustPolicy
-            >::turn_info turn_info;
+                    <
+                        Linear1,
+                        Linear2,
+                        assign_policy
+                    >
+            >::template turn_info_type<Strategy, RobustPolicy>::type turn_info;
 
         typedef std::vector<turn_info> turns_container;