updated boost on windows

winx64/include/boost/geometry/algorithms/detail/envelope/linear.hpp

@@ -4,11 +4,12 @@
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2015, 2016.
-// Modifications copyright (c) 2015-2016, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015, 2016, 2018.
+// Modifications copyright (c) 2015-2018, 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
 
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
@@ -17,93 +18,40 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_LINEAR_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ENVELOPE_LINEAR_HPP
 
-#include <boost/geometry/core/cs.hpp>
-#include <boost/geometry/core/tags.hpp>
 
-#include <boost/geometry/iterators/segment_iterator.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/algorithms/detail/envelope/range.hpp>
 
 #include <boost/geometry/algorithms/dispatch/envelope.hpp>
 
+// For backward compatibility
+#include <boost/geometry/strategies/cartesian/envelope.hpp>
+#include <boost/geometry/strategies/spherical/envelope.hpp>
+#include <boost/geometry/strategies/geographic/envelope.hpp>
 
 namespace boost { namespace geometry
 {
 
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace envelope
-{
-
-
-struct envelope_linestring_on_spheroid
-{
-    template <typename Linestring, typename Box, typename Strategy>
-    static inline void apply(Linestring const& linestring,
-                             Box& mbr,
-                             Strategy const& strategy)
-    {
-        envelope_range::apply(geometry::segments_begin(linestring),
-                              geometry::segments_end(linestring),
-                              mbr,
-                              strategy);
-    }
-};
-
-
-}} // namespace detail::envelope
-#endif // DOXYGEN_NO_DETAIL
-
-
 #ifndef DOXYGEN_NO_DISPATCH
 namespace dispatch
 {
 
 
-template <typename Linestring, typename CS_Tag>
-struct envelope<Linestring, linestring_tag, CS_Tag>
+template <typename Linestring>
+struct envelope<Linestring, linestring_tag>
     : detail::envelope::envelope_range
 {};
 
-template <typename Linestring>
-struct envelope<Linestring, linestring_tag, spherical_equatorial_tag>
-    : detail::envelope::envelope_linestring_on_spheroid
-{};
 
-template <typename Linestring>
-struct envelope<Linestring, linestring_tag, geographic_tag>
-    : detail::envelope::envelope_linestring_on_spheroid
-{};
-
-
-template <typename MultiLinestring, typename CS_Tag>
-struct envelope
-    <
-        MultiLinestring, multi_linestring_tag, CS_Tag
-    > : detail::envelope::envelope_multi_range
+template <typename MultiLinestring>
+struct envelope<MultiLinestring, multi_linestring_tag>
+    : detail::envelope::envelope_multi_range
         <
             detail::envelope::envelope_range
         >
 {};
 
-template <typename MultiLinestring>
-struct envelope
-    <
-        MultiLinestring, multi_linestring_tag, spherical_equatorial_tag
-    > : detail::envelope::envelope_multi_range_on_spheroid
-        <
-            detail::envelope::envelope_linestring_on_spheroid
-        >
-{};
-
-template <typename MultiLinestring>
-struct envelope
-    <
-        MultiLinestring, multi_linestring_tag, geographic_tag
-    > : detail::envelope::envelope_multi_range_on_spheroid
-        <
-            detail::envelope::envelope_linestring_on_spheroid
-        >
-{};
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH