import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / detail / covered_by / implementation.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/covered_by/implementation.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/covered_by/implementation.hpp
index 3df8b7783dc7342d193e306f6cccf1a21305f4c9..b180a3d5a39311a4c5536a47e6ca72851da46748 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/covered_by/implementation.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/covered_by/implementation.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2013, 2014, 2017.
-// Modifications copyright (c) 2013-2017 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013, 2014, 2017, 2019.
+// Modifications copyright (c) 2013-2019 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -19,9 +19,8 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_COVERED_BY_IMPLEMENTATION_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_COVERED_BY_IMPLEMENTATION_HPP
 
-
 #include <cstddef>
-
+#include <boost/core/ignore_unused.hpp>
 #include <boost/geometry/algorithms/detail/covered_by/interface.hpp>
 #include <boost/geometry/algorithms/detail/within/implementation.hpp>
 
@@ -37,7 +36,7 @@ struct use_point_in_geometry
     template <typename Geometry1, typename Geometry2, typename Strategy>
     static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
     {
-        return detail::within::point_in_geometry(geometry1, geometry2, strategy) >= 0;
+        return detail::within::covered_by_point_geometry(geometry1, geometry2, strategy);
     }
 };
 
@@ -67,7 +66,7 @@ struct covered_by<Point, Box, point_tag, box_tag>
     template <typename Strategy>
     static inline bool apply(Point const& point, Box const& box, Strategy const& strategy)
     {
-        ::boost::ignore_unused_variable_warning(strategy);
+        ::boost::ignore_unused(strategy);
         return strategy.apply(point, box);
     }
 };
@@ -79,7 +78,7 @@ struct covered_by<Box1, Box2, box_tag, box_tag>
     static inline bool apply(Box1 const& box1, Box2 const& box2, Strategy const& strategy)
     {
         assert_dimension_equal<Box1, Box2>();
-        ::boost::ignore_unused_variable_warning(strategy);
+        ::boost::ignore_unused(strategy);
         return strategy.apply(box1, box2);
     }
 };