Imported Upstream version 1.64.0

[platform/upstream/boost.git] / boost / geometry / algorithms / detail / envelope / point.hpp

diff --git a/boost/geometry/algorithms/detail/envelope/point.hpp b/boost/geometry/algorithms/detail/envelope/point.hpp
index e914e7e..ee0559b 100644 (file)
--- a/boost/geometry/algorithms/detail/envelope/point.hpp
+++ b/boost/geometry/algorithms/detail/envelope/point.hpp
@@ -4,9 +4,10 @@
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015, 2016.
+// Modifications copyright (c) 2015-2016, 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
 
 // Distributed under the Boost Software License, Version 1.0.
@@ -58,8 +59,8 @@ struct envelope_one_point
             >::apply(point, box_corner);
     }
 
-    template <typename Point, typename Box>
-    static inline void apply(Point const& point, Box& mbr)
+    template <typename Point, typename Box, typename Strategy>
+    static inline void apply(Point const& point, Box& mbr, Strategy const&)
     {
         apply<min_corner>(point, mbr);
         apply<max_corner>(point, mbr);
@@ -69,8 +70,8 @@ struct envelope_one_point
 
 struct envelope_point_on_spheroid
 {
-    template<typename Point, typename Box>
-    static inline void apply(Point const& point, Box& mbr)
+    template<typename Point, typename Box, typename Strategy>
+    static inline void apply(Point const& point, Box& mbr, Strategy const& strategy)
     {
         Point normalized_point = detail::return_normalized<Point>(point);
 
@@ -88,7 +89,7 @@ struct envelope_point_on_spheroid
         envelope_one_point
             <
                 2, dimension<Point>::value
-            >::apply(normalized_point, mbr);
+            >::apply(normalized_point, mbr, strategy);
     }
 };