1 files changed, 11 insertions, 18 deletions
diff --git a/boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp b/boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp
index ce0853d20c..82a1f5f4cd 100644
--- a/boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp
+++ b/boost/geometry/algorithms/detail/is_valid/has_invalid_coordinate.hpp
@@ -1,7 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2020, Oracle and/or its affiliates.
+// Copyright (c) 2014-2021, Oracle and/or its affiliates.
 
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -14,7 +15,6 @@
 #include <cstddef>
 #include <type_traits>
 
-#include <boost/geometry/algorithms/detail/check_iterator_range.hpp>
 #include <boost/geometry/algorithms/validity_failure_type.hpp>
 
 #include <boost/geometry/core/coordinate_type.hpp>
@@ -28,7 +28,7 @@
 
 namespace boost { namespace geometry
 {
-    
+
 #ifndef DOXYGEN_NO_DETAIL
 namespace detail { namespace is_valid
 {
@@ -80,26 +80,19 @@ struct indexed_has_invalid_coordinate
 
 struct range_has_invalid_coordinate
 {
-    struct point_has_valid_coordinates
-    {
-        template <typename Point>
-        static inline bool apply(Point const& point)
-        {
-            return ! point_has_invalid_coordinate::apply(point);
-        }
-    };
-
     template <typename Geometry, typename VisitPolicy>
     static inline bool apply(Geometry const& geometry, VisitPolicy& visitor)
     {
         boost::ignore_unused(visitor);
 
-        bool const has_valid_coordinates = detail::check_iterator_range
-            <
-                point_has_valid_coordinates,
-                true // do not consider an empty range as problematic
-            >::apply(geometry::points_begin(geometry),
-                     geometry::points_end(geometry));
+        auto const points_end = geometry::points_end(geometry);
+        bool const has_valid_coordinates = std::none_of
+            (
+                geometry::points_begin(geometry), points_end,
+                []( auto const& point ){
+                    return point_has_invalid_coordinate::apply(point);
+                }
+            );
 
         return has_valid_coordinates
             ?