Imported Upstream version 1.64.0upstream/1.64.0

Change-Id: Id9212edd016dd55f21172c427aa7894d1d24148b
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 26 insertions, 14 deletions

diff --git a/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp b/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
index a8171e1482..9beb8ad64f 100644
--- a/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
+++ b/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
@@ -2,6 +2,10 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -106,19 +110,27 @@ class backtrack_check_self_intersections
 public :
     typedef state state_type;
 
-    template <typename Operation, typename Rings, typename Ring, typename Turns, typename RobustPolicy, typename Visitor>
+    template
+    <
+        typename Operation,
+        typename Rings, typename Ring, typename Turns,
+        typename Strategy,
+        typename RobustPolicy,
+        typename Visitor
+    >
     static inline void apply(std::size_t size_at_start,
-                Rings& rings, Ring& ring,
-                Turns& turns,
-                typename boost::range_value<Turns>::type const& turn,
-                Operation& operation,
-                traverse_error_type traverse_error,
-                Geometry1 const& geometry1,
-                Geometry2 const& geometry2,
-                RobustPolicy const& robust_policy,
-                state_type& state,
-                Visitor& visitor
-                )
+                             Rings& rings,
+                             Ring& ring,
+                             Turns& turns,
+                             typename boost::range_value<Turns>::type const& turn,
+                             Operation& operation,
+                             traverse_error_type traverse_error,
+                             Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             Strategy const& strategy,
+                             RobustPolicy const& robust_policy,
+                             state_type& state,
+                             Visitor& visitor)
     {
         visitor.visit_traverse_reject(turns, turn, operation, traverse_error);
 
@@ -128,8 +140,8 @@ public :
         if (! state.m_checked)
         {
             state.m_checked = true;
-            has_self_intersections(geometry1, robust_policy);
-            has_self_intersections(geometry2, robust_policy);
+            has_self_intersections(geometry1, strategy, robust_policy);
+            has_self_intersections(geometry2, strategy, robust_policy);
         }
 
         // Make bad output clean