import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / detail / sections / section_box_policies.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_box_policies.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_box_policies.hpp
index cf06700306cd23c11ca8a4b49367600ad7c4200a..e6342ff7098a442a4852b88ca44c698adbf04488 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_box_policies.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_box_policies.hpp
@@ -2,6 +2,10 @@
 
 // Copyright (c) 2015 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2018.
+// Modifications copyright (c) 2018, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -21,21 +25,25 @@ namespace boost { namespace geometry
 namespace detail { namespace section
 {
 
+template <typename ExpandBoxStrategy>
 struct get_section_box
 {
     template <typename Box, typename Section>
     static inline void apply(Box& total, Section const& section)
     {
-        geometry::expand(total, section.bounding_box);
+        geometry::expand(total, section.bounding_box,
+                         ExpandBoxStrategy());
     }
 };
 
+template <typename DisjointBoxBoxStrategy>
 struct overlaps_section_box
 {
     template <typename Box, typename Section>
     static inline bool apply(Box const& box, Section const& section)
     {
-        return ! detail::disjoint::disjoint_box_box(box, section.bounding_box);
+        return ! detail::disjoint::disjoint_box_box(box, section.bounding_box,
+                                                    DisjointBoxBoxStrategy());
     }
 };