import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
index bdf056d76e8094c17f5e7fefa9a0c4d7e7987ae8..55380a3a897a7412bf330df376b3ef25fd003a63 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
@@ -1,8 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2019, 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
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -70,7 +71,7 @@ public:
     apply(Segment1 const& segment1, Segment2 const& segment2,
           Strategy const& strategy)
     {
-        if (geometry::intersects(segment1, segment2))
+        if (geometry::intersects(segment1, segment2, strategy.get_relate_segment_segment_strategy()))
         {
             return 0;
         }