updated boost on windows

winx64/include/boost/geometry/geometries/adapted/boost_polygon/hole_iterator.hpp

@@ -15,7 +15,6 @@
 
 #include <boost/polygon/polygon.hpp>
 
-#include <boost/iterator.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 
 

winx64/include/boost/geometry/geometries/adapted/boost_polygon/ring_proxy.hpp

@@ -2,6 +2,11 @@
 
 // Copyright (c) 2010-2012 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)
@@ -14,9 +19,11 @@
 //   pair{begin_points, end_points} -> ring_proxy
 
 #include <boost/polygon/polygon.hpp>
-#include <boost/range.hpp>
-
+#include <boost/range/const_iterator.hpp>
+#include <boost/range/mutable_iterator.hpp>
 
+#include <boost/geometry/core/mutable_range.hpp>
+#include <boost/geometry/core/tag.hpp>
 
 namespace boost { namespace geometry
 {

winx64/include/boost/geometry/geometries/adapted/boost_tuple.hpp

@@ -4,6 +4,11 @@
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// 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
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -19,6 +24,7 @@
 
 #include <boost/tuple/tuple.hpp>
 
+#include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/core/point_type.hpp>

winx64/include/boost/geometry/geometries/adapted/std_array.hpp

@@ -12,6 +12,12 @@
 #define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_STD_ARRAY_HPP
 
 
+#include <boost/config.hpp>
+
+
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
+
+
 #define BOOST_GEOMETRY_ADAPTED_STD_ARRAY_TAG_DEFINED
 
 
@@ -111,5 +117,14 @@ struct access<std::array<CoordinateType, DimensionCount>, Dimension>
     }}}
 
 
+#else
+
+
+#warning "This file requires compiler and library support for the ISO C++ 2011 standard."
+
+
+#endif // BOOST_NO_CXX11_HDR_ARRAY
+
+
 #endif // BOOST_GEOMETRY_GEOMETRIES_ADAPTED_STD_ARRAY_HPP
 

winx64/include/boost/geometry/geometries/concepts/box_concept.hpp

@@ -15,11 +15,10 @@
 #ifndef BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_BOX_CONCEPT_HPP
 #define BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_BOX_CONCEPT_HPP
 
-
 #include <cstddef>
 
 #include <boost/concept_check.hpp>
-
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
@@ -109,7 +108,7 @@ class ConstBox
         {
             const Geometry* b = 0;
             coordinate_type coord(geometry::get<Index, Dimension>(*b));
-            boost::ignore_unused_variable_warning(coord);
+            boost::ignore_unused(coord);
             dimension_checker<Index, Dimension + 1, DimensionCount>::apply();
         }
     };

winx64/include/boost/geometry/geometries/concepts/check.hpp

@@ -18,6 +18,7 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/concept/requires.hpp>
+#include <boost/core/ignore_unused.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/variant/variant_fwd.hpp>
 
@@ -216,7 +217,7 @@ template <typename Geometry>
 inline void check()
 {
     detail::checker<Geometry> c;
-    boost::ignore_unused_variable_warning(c);
+    boost::ignore_unused(c);
 }
 
 

winx64/include/boost/geometry/geometries/concepts/multi_point_concept.hpp

@@ -20,6 +20,7 @@
 #include <boost/range/concepts.hpp>
 #include <boost/range/metafunctions.hpp>
 
+#include <boost/geometry/core/mutable_range.hpp>
 
 #include <boost/geometry/geometries/concepts/point_concept.hpp>
 

winx64/include/boost/geometry/geometries/concepts/polygon_concept.hpp

@@ -15,6 +15,7 @@
 #define BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_POLYGON_CONCEPT_HPP
 
 #include <boost/concept_check.hpp>
+#include <boost/core/ignore_unused.hpp>
 #include <boost/range/concepts.hpp>
 
 #include <boost/geometry/core/access.hpp>
@@ -65,12 +66,8 @@ class Polygon
             ring_const_type ce = traits::exterior_ring<PolygonType>::get(*cpoly);
             interior_const_type ci = traits::interior_rings<PolygonType>::get(*cpoly);
 
-            boost::ignore_unused_variable_warning(e);
-            boost::ignore_unused_variable_warning(i);
-            boost::ignore_unused_variable_warning(ce);
-            boost::ignore_unused_variable_warning(ci);
-            boost::ignore_unused_variable_warning(poly);
-            boost::ignore_unused_variable_warning(cpoly);
+            boost::ignore_unused(poly, cpoly);
+            boost::ignore_unused(e, i, ce, ci);
         }
     };
 
@@ -115,9 +112,7 @@ class ConstPolygon
             ring_const_type ce = traits::exterior_ring<const_polygon_type>::get(*cpoly);
             interior_const_type ci = traits::interior_rings<const_polygon_type>::get(*cpoly);
 
-            boost::ignore_unused_variable_warning(ce);
-            boost::ignore_unused_variable_warning(ci);
-            boost::ignore_unused_variable_warning(cpoly);
+            boost::ignore_unused(ce, ci, cpoly);
         }
     };
 

winx64/include/boost/geometry/geometries/concepts/segment_concept.hpp

@@ -14,8 +14,8 @@
 #ifndef BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_SEGMENT_CONCEPT_HPP
 #define BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_SEGMENT_CONCEPT_HPP
 
-
 #include <boost/concept_check.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/geometries/concepts/point_concept.hpp>
 
@@ -106,7 +106,7 @@ class ConstSegment
         {
             const Geometry* s = 0;
             coordinate_type coord(geometry::get<Index, Dimension>(*s));
-            boost::ignore_unused_variable_warning(coord);
+            boost::ignore_unused(coord);
             dimension_checker<Index, Dimension + 1, DimensionCount>::apply();
         }
     };

winx64/include/boost/geometry/geometries/helper_geometry.hpp

@@ -1,8 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2015, Oracle and/or its affiliates.
+// Copyright (c) 2015-2017, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -10,6 +11,8 @@
 #ifndef BOOST_GEOMETRY_GEOMETRIES_HELPER_GEOMETRY_HPP
 #define BOOST_GEOMETRY_GEOMETRIES_HELPER_GEOMETRY_HPP
 
+#include <boost/mpl/assert.hpp>
+
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
@@ -29,52 +32,6 @@ namespace boost { namespace geometry
 namespace detail { namespace helper_geometries
 {
 
-template <typename Geometry, typename CS_Tag = typename cs_tag<Geometry>::type>
-struct default_units
-{
-    typedef typename coordinate_system<Geometry>::type::units type;
-};
-
-// The Cartesian coordinate system does not define the type units.
-// For that reason the generic implementation for default_units cannot be used
-// and specialization needs to be defined.
-// Moreover, it makes sense to define the units for the Cartesian
-// coordinate system to be radians, as this way a Cartesian point can
-// potentially be used in algorithms taking non-Cartesian strategies
-// and work as if it was as point in the non-Cartesian coordinate
-// system with radian units.
-template <typename Geometry>
-struct default_units<Geometry, cartesian_tag>
-{
-    typedef radian type;
-};
-
-
-template <typename Units, typename CS_Tag>
-struct cs_tag_to_coordinate_system
-{
-    typedef cs::cartesian type;
-};
-
-template <typename Units>
-struct cs_tag_to_coordinate_system<Units, spherical_equatorial_tag>
-{
-    typedef cs::spherical_equatorial<Units> type;
-};
-
-template <typename Units>
-struct cs_tag_to_coordinate_system<Units, spherical_tag>
-{
-    typedef cs::spherical<Units> type;
-};
-
-template <typename Units>
-struct cs_tag_to_coordinate_system<Units, geographic_tag>
-{
-    typedef cs::geographic<Units> type;
-};
-
-
 template
 <
     typename Point,
@@ -143,10 +100,7 @@ template
 <
     typename Geometry,
     typename NewCoordinateType = typename coordinate_type<Geometry>::type,
-    typename NewUnits = typename detail::helper_geometries::default_units
-        <
-            Geometry
-        >::type
+    typename NewUnits = typename detail::cs_angular_units<Geometry>::type
 >
 struct helper_geometry
 {

winx64/include/boost/geometry/geometries/polygon.hpp

@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2014-2018 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -47,9 +47,9 @@ namespace model
 \tparam Closed true for closed polygons (last point == first point),
             false open points
 \tparam PointList container type for points,
-            for example std::vector, std::list, std::deque
+            for example std::vector, std::deque
 \tparam RingList container type for inner rings,
-            for example std::vector, std::list, std::deque
+            for example std::vector, std::deque
 \tparam PointAlloc container-allocator-type, for the points
 \tparam RingAlloc container-allocator-type, for the rings
 \note The container collecting the points in the rings can be different

winx64/include/boost/geometry/geometries/variant.hpp

@@ -4,6 +4,11 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// 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
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -15,8 +20,10 @@
 #define BOOST_GEOMETRY_GEOMETRIES_VARIANT_GEOMETRY_HPP
 
 
-#include <boost/variant/variant_fwd.hpp>
 #include <boost/mpl/front.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
 
 
 namespace boost { namespace geometry {