From 9059f73d5491efc8a8263771d86f49de85ebf6db Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Tue, 24 Jun 2014 19:43:32 +0300 Subject: [PATCH] [algorithms][is_valid] remove USE_INTERRUPT_POLICY macro --- .../detail/is_valid/has_valid_self_turns.hpp | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp b/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp index a96d27c45..220a67bcd 100644 --- a/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp +++ b/include/boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp @@ -16,10 +16,6 @@ #include #include -#ifndef USE_INTERRUPT_POLICY -#include -#endif - #include #include #include @@ -74,31 +70,17 @@ public: rescale_policy_type robust_policy = geometry::get_rescale_policy(geometry); -#define USE_INTERRUPT_POLICY - -#ifdef USE_INTERRUPT_POLICY detail::overlay::stateless_predicate_based_interrupt_policy < IsAcceptableTurn > interrupt_policy; -#else - detail::self_get_turn_points::no_interrupt_policy interrupt_policy; -#endif + geometry::self_turns(geometry, robust_policy, turns, interrupt_policy); -#ifdef USE_INTERRUPT_POLICY return !interrupt_policy.has_intersections; -#else - bool has_valid_turns = check_iterator_range - < - IsAcceptableTurn - >::apply(turns.begin(), turns.end()); - - return has_valid_turns; -#endif } };