update boost
This commit is contained in:
@@ -5,6 +5,11 @@
|
||||
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
|
||||
// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
|
||||
|
||||
// This file was modified by Oracle on 2020-2023.
|
||||
// Modifications copyright (c) 2020-2023 Oracle and/or its affiliates.
|
||||
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
|
||||
// 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,26 +20,25 @@
|
||||
#ifndef BOOST_GEOMETRY_ALGORITHMS_TRANSFORM_HPP
|
||||
#define BOOST_GEOMETRY_ALGORITHMS_TRANSFORM_HPP
|
||||
|
||||
#include <cmath>
|
||||
#include <iterator>
|
||||
#include <type_traits>
|
||||
|
||||
#include <boost/range.hpp>
|
||||
#include <boost/type_traits/remove_reference.hpp>
|
||||
#include <boost/range/begin.hpp>
|
||||
#include <boost/range/end.hpp>
|
||||
#include <boost/range/size.hpp>
|
||||
#include <boost/range/value_type.hpp>
|
||||
|
||||
#include <boost/variant/apply_visitor.hpp>
|
||||
#include <boost/variant/static_visitor.hpp>
|
||||
#include <boost/variant/variant_fwd.hpp>
|
||||
|
||||
#include <boost/geometry/algorithms/assign.hpp>
|
||||
#include <boost/geometry/algorithms/clear.hpp>
|
||||
#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
|
||||
#include "boost/geometry/algorithms/detail/assign_indexed_point.hpp"
|
||||
#include "boost/geometry/algorithms/detail/assign_values.hpp"
|
||||
#include <boost/geometry/algorithms/num_interior_rings.hpp>
|
||||
|
||||
#include <boost/geometry/core/cs.hpp>
|
||||
#include <boost/geometry/core/exterior_ring.hpp>
|
||||
#include <boost/geometry/core/interior_rings.hpp>
|
||||
#include <boost/geometry/core/mutable_range.hpp>
|
||||
#include <boost/geometry/core/ring_type.hpp>
|
||||
#include <boost/geometry/core/tag_cast.hpp>
|
||||
#include <boost/geometry/core/tags.hpp>
|
||||
#include <boost/geometry/geometries/concepts/check.hpp>
|
||||
@@ -136,10 +140,7 @@ inline bool transform_range_out(Range const& range,
|
||||
OutputIterator out, Strategy const& strategy)
|
||||
{
|
||||
PointOut point_out;
|
||||
for(typename boost::range_iterator<Range const>::type
|
||||
it = boost::begin(range);
|
||||
it != boost::end(range);
|
||||
++it)
|
||||
for (auto it = boost::begin(range); it != boost::end(range); ++it)
|
||||
{
|
||||
if (! transform_point::apply(*it, point_out, strategy))
|
||||
{
|
||||
@@ -170,22 +171,18 @@ struct transform_polygon
|
||||
// Note: here a resizeable container is assumed.
|
||||
traits::resize
|
||||
<
|
||||
typename boost::remove_reference
|
||||
typename std::remove_reference
|
||||
<
|
||||
typename traits::interior_mutable_type<Polygon2>::type
|
||||
>::type
|
||||
>::apply(geometry::interior_rings(poly2),
|
||||
geometry::num_interior_rings(poly1));
|
||||
|
||||
typename geometry::interior_return_type<Polygon1 const>::type
|
||||
rings1 = geometry::interior_rings(poly1);
|
||||
typename geometry::interior_return_type<Polygon2>::type
|
||||
rings2 = geometry::interior_rings(poly2);
|
||||
auto const& rings1 = geometry::interior_rings(poly1);
|
||||
auto&& rings2 = geometry::interior_rings(poly2);
|
||||
|
||||
typename detail::interior_iterator<Polygon1 const>::type
|
||||
it1 = boost::begin(rings1);
|
||||
typename detail::interior_iterator<Polygon2>::type
|
||||
it2 = boost::begin(rings2);
|
||||
auto it1 = boost::begin(rings1);
|
||||
auto it2 = boost::begin(rings2);
|
||||
for ( ; it1 != boost::end(rings1); ++it1, ++it2)
|
||||
{
|
||||
if ( ! transform_range_out<point2_type>(*it1,
|
||||
@@ -244,10 +241,8 @@ struct transform_multi
|
||||
{
|
||||
traits::resize<Multi2>::apply(multi2, boost::size(multi1));
|
||||
|
||||
typename boost::range_iterator<Multi1 const>::type it1
|
||||
= boost::begin(multi1);
|
||||
typename boost::range_iterator<Multi2>::type it2
|
||||
= boost::begin(multi2);
|
||||
auto it1 = boost::begin(multi1);
|
||||
auto it2 = boost::begin(multi2);
|
||||
|
||||
for (; it1 != boost::end(multi1); ++it1, ++it2)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user