From 05186e267dc1be8b481bdf78b4b79e2b7e3c22ba Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Thu, 17 Mar 2011 14:02:01 +0000 Subject: [PATCH] Changed BOOST_AUTO to BOOST_AUTO_TPL for pgi 11.2 [SVN r70060] --- include/boost/geometry/algorithms/centroid.hpp | 2 +- include/boost/geometry/algorithms/correct.hpp | 6 +++--- .../geometry/algorithms/detail/calculate_sum.hpp | 2 +- .../algorithms/detail/equals/collect_vectors.hpp | 2 +- .../geometry/algorithms/detail/overlay/get_turns.hpp | 6 +++--- .../algorithms/detail/overlay/select_rings.hpp | 12 ++++++------ .../algorithms/detail/sections/sectionalize.hpp | 4 ++-- include/boost/geometry/algorithms/distance.hpp | 2 +- include/boost/geometry/algorithms/for_each.hpp | 8 ++++---- include/boost/geometry/algorithms/num_points.hpp | 2 +- include/boost/geometry/algorithms/reverse.hpp | 2 +- include/boost/geometry/algorithms/simplify.hpp | 4 ++-- include/boost/geometry/algorithms/transform.hpp | 6 +++--- include/boost/geometry/algorithms/unique.hpp | 2 +- include/boost/geometry/algorithms/within.hpp | 2 +- .../boost/geometry/domains/gis/io/wkt/write_wkt.hpp | 2 +- .../extensions/algorithms/buffer/polygon_buffer.hpp | 2 +- .../algorithms/detail/overlay/split_rings.hpp | 4 ++-- .../geometry/extensions/algorithms/mark_spikes.hpp | 2 +- .../geometry/extensions/algorithms/remove_marked.hpp | 12 ++++++------ .../geometry/extensions/algorithms/remove_spikes.hpp | 2 +- .../extensions/gis/io/shapelib/shp_create_object.hpp | 2 +- .../boost/geometry/extensions/io/svg/write_svg.hpp | 4 ++-- .../multi/algorithms/detail/for_each_range.hpp | 2 +- include/boost/geometry/multi/algorithms/for_each.hpp | 2 +- include/boost/geometry/util/write_dsv.hpp | 2 +- 26 files changed, 49 insertions(+), 49 deletions(-) diff --git a/include/boost/geometry/algorithms/centroid.hpp b/include/boost/geometry/algorithms/centroid.hpp index 814145529..c755fa9fb 100644 --- a/include/boost/geometry/algorithms/centroid.hpp +++ b/include/boost/geometry/algorithms/centroid.hpp @@ -281,7 +281,7 @@ struct centroid_polygon_state typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { per_ring::apply(*it, strategy, state); } diff --git a/include/boost/geometry/algorithms/correct.hpp b/include/boost/geometry/algorithms/correct.hpp index 85cbd091f..33c6c425f 100644 --- a/include/boost/geometry/algorithms/correct.hpp +++ b/include/boost/geometry/algorithms/correct.hpp @@ -167,7 +167,7 @@ struct correct_polygon typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { correct_ring < @@ -221,8 +221,8 @@ template struct correct : detail::correct::correct_ring < - Ring, - std::less::type> + Ring, + std::less::type> > {}; diff --git a/include/boost/geometry/algorithms/detail/calculate_sum.hpp b/include/boost/geometry/algorithms/detail/calculate_sum.hpp index 3770c1fef..a7e6baff3 100644 --- a/include/boost/geometry/algorithms/detail/calculate_sum.hpp +++ b/include/boost/geometry/algorithms/detail/calculate_sum.hpp @@ -33,7 +33,7 @@ class calculate_polygon_sum static inline ReturnType sum_interior_rings(Rings const& rings, Strategy const& strategy) { ReturnType sum = ReturnType(); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { sum += Policy::apply(*it, strategy); } diff --git a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp index 7d24decec..1af41cb1c 100644 --- a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp +++ b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp @@ -183,7 +183,7 @@ struct polygon_collect_vectors typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { per_range::apply(collection, *it); } diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp index d04dbebc2..1ad84c6c5 100644 --- a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp @@ -355,8 +355,8 @@ struct section_visitor Turns& m_turns; InterruptPolicy& m_interrupt_policy; - section_visitor(int id1, Geometry1 const& g1, - int id2, Geometry2 const& g2, + section_visitor(int id1, Geometry1 const& g1, + int id2, Geometry2 const& g2, Turns& turns, InterruptPolicy& ip) : m_source_id1(id1), m_geometry1(g1) , m_source_id2(id2), m_geometry2(g2) @@ -637,7 +637,7 @@ struct get_turns_polygon_cs typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it, ++i) { intersector_type::apply( diff --git a/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp b/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp index 1b794b6cc..66ecafc89 100644 --- a/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp @@ -87,7 +87,7 @@ namespace dispatch typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { id.ring_index++; per_ring::apply(*it, geometry, id, map); @@ -104,7 +104,7 @@ namespace dispatch typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { id.ring_index++; per_ring::apply(*it, id, map); @@ -173,13 +173,13 @@ template overlay_type OverlayType, typename IntersectionMap, typename SelectionMap > -inline void update_selection_map(IntersectionMap const& intersection_map, +inline void update_selection_map(IntersectionMap const& intersection_map, SelectionMap const& map_with_all, SelectionMap& selection_map) { selection_map.clear(); - for (typename SelectionMap::const_iterator it = boost::begin(map_with_all); - it != boost::end(map_with_all); + for (typename SelectionMap::const_iterator it = boost::begin(map_with_all); + it != boost::end(map_with_all); ++it) { /* @@ -234,7 +234,7 @@ inline void select_rings(Geometry1 const& geometry1, Geometry2 const& geometry2, template < overlay_type OverlayType, - typename Geometry, + typename Geometry, typename IntersectionMap, typename SelectionMap > inline void select_rings(Geometry const& geometry, diff --git a/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp b/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp index f79e883c1..6d442a65e 100644 --- a/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp +++ b/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp @@ -359,7 +359,7 @@ struct sectionalize_range Reverse ? iterate_reverse : iterate_forward >::type view_type; - static inline void apply(Range const& range, Sections& sections, + static inline void apply(Range const& range, Sections& sections, ring_identifier ring_id) { typedef model::referring_segment segment_type; @@ -428,7 +428,7 @@ struct sectionalize_polygon ring_id.ring_index++; typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it, ++ring_id.ring_index) { sectionalizer_type::apply(*it, sections, ring_id); diff --git a/include/boost/geometry/algorithms/distance.hpp b/include/boost/geometry/algorithms/distance.hpp index 7d3a1b28c..0406ff3cd 100644 --- a/include/boost/geometry/algorithms/distance.hpp +++ b/include/boost/geometry/algorithms/distance.hpp @@ -211,7 +211,7 @@ struct point_to_polygon typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { distance_containment dcr = per_ring::apply(point, *it, pp_strategy, ps_strategy); diff --git a/include/boost/geometry/algorithms/for_each.hpp b/include/boost/geometry/algorithms/for_each.hpp index 3e954ebd5..17175b337 100644 --- a/include/boost/geometry/algorithms/for_each.hpp +++ b/include/boost/geometry/algorithms/for_each.hpp @@ -82,8 +82,8 @@ struct fe_range_per_segment typename point_type::type >::type point_type; - BOOST_AUTO(it, boost::begin(range)); - BOOST_AUTO(previous, it++); + BOOST_AUTO_TPL(it, boost::begin(range)); + BOOST_AUTO_TPL(previous, it++); while(it != boost::end(range)) { model::referring_segment s(*previous, *it); @@ -114,7 +114,7 @@ struct fe_polygon_per_point typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { f = per_ring::apply(*it, f); } @@ -143,7 +143,7 @@ struct fe_polygon_per_segment typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { f = per_ring::apply(*it, f); } diff --git a/include/boost/geometry/algorithms/num_points.hpp b/include/boost/geometry/algorithms/num_points.hpp index 38b6acde3..71452bea3 100644 --- a/include/boost/geometry/algorithms/num_points.hpp +++ b/include/boost/geometry/algorithms/num_points.hpp @@ -77,7 +77,7 @@ struct polygon_count typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { n += range_count::apply(*it, add_for_open); } diff --git a/include/boost/geometry/algorithms/reverse.hpp b/include/boost/geometry/algorithms/reverse.hpp index 524807455..b93fa3503 100644 --- a/include/boost/geometry/algorithms/reverse.hpp +++ b/include/boost/geometry/algorithms/reverse.hpp @@ -48,7 +48,7 @@ struct polygon_reverse typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { per_range::apply(*it); } diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp index 18b01be16..3aab6fcf5 100644 --- a/include/boost/geometry/algorithms/simplify.hpp +++ b/include/boost/geometry/algorithms/simplify.hpp @@ -144,8 +144,8 @@ struct simplify_polygon = interior_rings(poly_in); typename interior_return_type::type rings_out = interior_rings(poly_out); - BOOST_AUTO(it_out, boost::begin(rings_out)); - for (BOOST_AUTO(it_in, boost::begin(rings_in)); + BOOST_AUTO_TPL(it_out, boost::begin(rings_out)); + for (BOOST_AUTO_TPL(it_in, boost::begin(rings_in)); it_in != boost::end(rings_in); ++it_in, ++it_out) { diff --git a/include/boost/geometry/algorithms/transform.hpp b/include/boost/geometry/algorithms/transform.hpp index 8f5ea8e06..8abe1b403 100644 --- a/include/boost/geometry/algorithms/transform.hpp +++ b/include/boost/geometry/algorithms/transform.hpp @@ -100,7 +100,7 @@ struct transform_box_or_segment assign_point_from_index<1>(source, source_point[1]); point_type2 target_point[2]; - if (strategy.apply(source_point[0], target_point[0]) + if (strategy.apply(source_point[0], target_point[0]) && strategy.apply(source_point[1], target_point[1])) { assign_point_to_index<0>(target_point[0], target); @@ -174,8 +174,8 @@ struct transform_polygon = interior_rings(poly1); typename interior_return_type::type rings2 = interior_rings(poly2); - BOOST_AUTO(it1, boost::begin(rings1)); - BOOST_AUTO(it2, boost::begin(rings2)); + BOOST_AUTO_TPL(it1, boost::begin(rings1)); + BOOST_AUTO_TPL(it2, boost::begin(rings2)); for ( ; it1 != boost::end(interior_rings(poly1)); ++it1, ++it2) { if (!transform_range_out(*it1, diff --git a/include/boost/geometry/algorithms/unique.hpp b/include/boost/geometry/algorithms/unique.hpp index 1a8672286..b81f8ad0f 100644 --- a/include/boost/geometry/algorithms/unique.hpp +++ b/include/boost/geometry/algorithms/unique.hpp @@ -58,7 +58,7 @@ struct polygon_unique typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { per_range::apply(*it, policy); } diff --git a/include/boost/geometry/algorithms/within.hpp b/include/boost/geometry/algorithms/within.hpp index 05d2794c7..39af69d76 100644 --- a/include/boost/geometry/algorithms/within.hpp +++ b/include/boost/geometry/algorithms/within.hpp @@ -219,7 +219,7 @@ struct point_in_polygon { typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { diff --git a/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp b/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp index 19d3d62b7..7b8c917b3 100644 --- a/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp +++ b/include/boost/geometry/domains/gis/io/wkt/write_wkt.hpp @@ -171,7 +171,7 @@ struct wkt_poly typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { os << ","; wkt_sequence::apply(os, *it); diff --git a/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp b/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp index 92fd2d75e..a1c0db337 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp +++ b/include/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp @@ -206,7 +206,7 @@ struct polygon_buffer typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings); it != boost::end(rings); ++it) { output_ring_type ring; policy::apply(*it, ring, distance, join_strategy diff --git a/include/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp b/include/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp index ca495a98c..3a4db705a 100644 --- a/include/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp +++ b/include/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp @@ -186,7 +186,7 @@ struct insert_rings typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { #ifdef BOOST_GEOMETRY_DEBUG_SPLIT_RINGS std::cout << geometry::wkt(*it) @@ -494,7 +494,7 @@ struct polygon_split_rings static inline void apply(Polygon const& polygon, RingCollection& ring_collection) { per_ring::apply(exterior_ring(polygon), ring_collection); - for (BOOST_AUTO(it, boost::begin(interior_rings(polygon))); + for (BOOST_AUTO_TPL(it, boost::begin(interior_rings(polygon))); it != boost::end(interior_rings(polygon)); ++it) { diff --git a/include/boost/geometry/extensions/algorithms/mark_spikes.hpp b/include/boost/geometry/extensions/algorithms/mark_spikes.hpp index 2fff6e4c9..f37d09722 100644 --- a/include/boost/geometry/extensions/algorithms/mark_spikes.hpp +++ b/include/boost/geometry/extensions/algorithms/mark_spikes.hpp @@ -363,7 +363,7 @@ struct polygon_mark_spikes typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { // Interior ring (zero based) id.ring_index++; diff --git a/include/boost/geometry/extensions/algorithms/remove_marked.hpp b/include/boost/geometry/extensions/algorithms/remove_marked.hpp index 1277d503c..3992e4d6e 100644 --- a/include/boost/geometry/extensions/algorithms/remove_marked.hpp +++ b/include/boost/geometry/extensions/algorithms/remove_marked.hpp @@ -46,7 +46,7 @@ struct range_remove_marked typedef typename coordinate_type::type coordinate_type; - static inline void apply(Range const& range_in, ring_identifier id, + static inline void apply(Range const& range_in, ring_identifier id, Range& range_out, MarkMap const& mark_map) { typename MarkMap::const_iterator mit = mark_map.find(id); @@ -82,7 +82,7 @@ struct range_remove_marked template struct polygon_remove_marked { - static inline void apply(Polygon const& polygon_in, ring_identifier id, + static inline void apply(Polygon const& polygon_in, ring_identifier id, Polygon& polygon_out, MarkMap const& mark_map) { typedef typename geometry::ring_type::type ring_type; @@ -98,10 +98,10 @@ struct polygon_remove_marked = interior_rings(polygon_out); rings_out.resize(boost::size(interior_rings(polygon_in))); - BOOST_AUTO(out, boost::begin(rings_out)); + BOOST_AUTO_TPL(out, boost::begin(rings_out)); - for (BOOST_AUTO(it, boost::begin(rings_in)); - it != boost::end(rings_in); + for (BOOST_AUTO_TPL(it, boost::begin(rings_in)); + it != boost::end(rings_in); ++it, ++out) { id.ring_index++; @@ -114,7 +114,7 @@ struct polygon_remove_marked template struct multi_remove_marked { - static inline void apply(MultiGeometry const& multi_in, ring_identifier id, + static inline void apply(MultiGeometry const& multi_in, ring_identifier id, MultiGeometry& multi_out, MarkMap const& mark_map) { id.multi_index = 0; diff --git a/include/boost/geometry/extensions/algorithms/remove_spikes.hpp b/include/boost/geometry/extensions/algorithms/remove_spikes.hpp index 11dc22cc7..c1826da1e 100644 --- a/include/boost/geometry/extensions/algorithms/remove_spikes.hpp +++ b/include/boost/geometry/extensions/algorithms/remove_spikes.hpp @@ -132,7 +132,7 @@ struct polygon_remove_spikes typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { per_range::apply(*it, policy); } diff --git a/include/boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp b/include/boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp index 0bc70f93b..729911b2c 100644 --- a/include/boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp +++ b/include/boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp @@ -103,7 +103,7 @@ struct shape_create_polygon typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { parts[ring++] = offset; offset = range_to_part(*it, xp, yp, offset); diff --git a/include/boost/geometry/extensions/io/svg/write_svg.hpp b/include/boost/geometry/extensions/io/svg/write_svg.hpp index 8d1466464..d1216833a 100644 --- a/include/boost/geometry/extensions/io/svg/write_svg.hpp +++ b/include/boost/geometry/extensions/io/svg/write_svg.hpp @@ -134,11 +134,11 @@ struct svg_poly { typename interior_return_type::type rings = interior_rings(polygon); - for (BOOST_AUTO(rit, boost::begin(rings)); + for (BOOST_AUTO_TPL(rit, boost::begin(rings)); rit != boost::end(rings); ++rit) { first = true; - for (BOOST_AUTO(it, boost::begin(*rit)); it != boost::end(*rit); + for (BOOST_AUTO_TPL(it, boost::begin(*rit)); it != boost::end(*rit); ++it, first = false) { os << (first ? "M" : " L") << " " diff --git a/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp index c95beea86..be99e97da 100644 --- a/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp +++ b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp @@ -34,7 +34,7 @@ struct fe_range_multi typename add_const_if_c::type& multi, Actor& actor) { - for(BOOST_AUTO(it, boost::begin(multi)); it != boost::end(multi); ++it) + for(BOOST_AUTO_TPL(it, boost::begin(multi)); it != boost::end(multi); ++it) { geometry::detail::for_each_range(*it, actor); } diff --git a/include/boost/geometry/multi/algorithms/for_each.hpp b/include/boost/geometry/multi/algorithms/for_each.hpp index 436cb960e..b6934a683 100644 --- a/include/boost/geometry/multi/algorithms/for_each.hpp +++ b/include/boost/geometry/multi/algorithms/for_each.hpp @@ -43,7 +43,7 @@ struct for_each_multi typename add_const_if_c::type& multi, Functor f) { - for(BOOST_AUTO(it, boost::begin(multi)); it != boost::end(multi); ++it) + for(BOOST_AUTO_TPL(it, boost::begin(multi)); it != boost::end(multi); ++it) { f = Policy::apply(*it, f); } diff --git a/include/boost/geometry/util/write_dsv.hpp b/include/boost/geometry/util/write_dsv.hpp index 42a659174..114fd1b1d 100644 --- a/include/boost/geometry/util/write_dsv.hpp +++ b/include/boost/geometry/util/write_dsv.hpp @@ -214,7 +214,7 @@ struct dsv_poly typename interior_return_type::type rings = interior_rings(poly); - for (BOOST_AUTO(it, boost::begin(rings)); it != boost::end(rings); ++it) + for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it) { os << settings.list_separator; dsv_range::apply(os, *it, settings);