import quincy beta 17.1.0

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

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
index f876af76ce5fa683260ab086d4114fdcddb997a3..a3ad6201628d5f697795eec02fd760bcd1443603 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
@@ -18,7 +18,10 @@
 #include <algorithm>
 #include <iterator>
 
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <boost/geometry/core/assert.hpp>
@@ -39,6 +42,7 @@
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 
+#include <boost/geometry/util/condition.hpp>
 
 namespace boost { namespace geometry
 {
@@ -243,7 +247,7 @@ protected:
                               linear::get(oit));
             }
         }
-        else if ( FollowIsolatedPoints
+        else if ( BOOST_GEOMETRY_CONDITION(FollowIsolatedPoints)
                   && is_isolated_point(*it, *op_it, entered) )
         {
             detail::turns::debug_turn(*it, *op_it, "-> Isolated point");
@@ -253,7 +257,7 @@ protected:
                     typename pointlike::type
                 >(it->point, pointlike::get(oit));
         }
-        else if ( FollowContinueTurns
+        else if ( BOOST_GEOMETRY_CONDITION(FollowContinueTurns)
                   && is_staying_inside(*it, *op_it, entered) )
         {
             detail::turns::debug_turn(*it, *op_it, "-> Staying inside");