Imported Upstream version 1.65.0upstream/1.65.0

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

1 files changed, 8 insertions, 7 deletions

diff --git a/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp b/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
index aa90e52db6..96efec79cd 100644
--- a/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
+++ b/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
@@ -1,8 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014-2017, 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
@@ -91,8 +92,9 @@ struct has_spikes
         return std::find_if(second, last, not_equal(*first));
     }
 
-    template <typename VisitPolicy>
-    static inline bool apply(Range const& range, VisitPolicy& visitor)
+    template <typename VisitPolicy, typename SideStrategy>
+    static inline bool apply(Range const& range, VisitPolicy& visitor,
+                             SideStrategy const& strategy)
     {
         boost::ignore_unused(visitor);
 
@@ -124,9 +126,8 @@ struct has_spikes
 
         while (next != boost::end(view))
         {
-            if ( geometry::detail::point_is_spike_or_equal(*prev,
-                                                           *next,
-                                                           *cur) )
+            if ( geometry::detail::point_is_spike_or_equal(*prev, *next, *cur,
+                                                           strategy) )
             {
                 return
                     ! visitor.template apply<failure_spikes>(is_linear, *cur);
@@ -146,7 +147,7 @@ struct has_spikes
                                                          boost::rend(view));
 
             iterator next = find_different_from_first(cur, boost::end(view));
-            if (detail::point_is_spike_or_equal(*prev, *next, *cur))
+            if (detail::point_is_spike_or_equal(*prev, *next, *cur, strategy))
             {
                 return
                     ! visitor.template apply<failure_spikes>(is_linear, *cur);