summaryrefslogtreecommitdiff
path: root/boost/geometry/algorithms/remove_spikes.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/geometry/algorithms/remove_spikes.hpp')
-rw-r--r--boost/geometry/algorithms/remove_spikes.hpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/boost/geometry/algorithms/remove_spikes.hpp b/boost/geometry/algorithms/remove_spikes.hpp
index e62ea9fe3d..a96a2c29d0 100644
--- a/boost/geometry/algorithms/remove_spikes.hpp
+++ b/boost/geometry/algorithms/remove_spikes.hpp
@@ -16,8 +16,9 @@
#include <boost/range.hpp>
#include <boost/type_traits/remove_reference.hpp>
-#include <boost/variant/static_visitor.hpp>
+
#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/static_visitor.hpp>
#include <boost/variant/variant_fwd.hpp>
#include <boost/geometry/core/closure.hpp>
@@ -26,11 +27,15 @@
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/core/point_order.hpp>
#include <boost/geometry/core/tags.hpp>
+
#include <boost/geometry/geometries/concepts/check.hpp>
+
#include <boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp>
#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
#include <boost/geometry/algorithms/clear.hpp>
+#include <boost/geometry/util/condition.hpp>
+
/*
Remove spikes from a ring/polygon.
@@ -94,7 +99,7 @@ struct range_remove_spikes
}
// For a closed-polygon, remove closing point, this makes checking first point(s) easier and consistent
- if (geometry::closure<Range>::value == geometry::closed)
+ if ( BOOST_GEOMETRY_CONDITION(geometry::closure<Range>::value == geometry::closed) )
{
cleaned.pop_back();
}
@@ -127,7 +132,7 @@ struct range_remove_spikes
}
// Close if necessary
- if (geometry::closure<Range>::value == geometry::closed)
+ if ( BOOST_GEOMETRY_CONDITION(geometry::closure<Range>::value == geometry::closed) )
{
cleaned.push_back(cleaned.front());
}