From 1609ce14ee1ff0e37ea31799c3cd1ea599759d69 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Sat, 24 Apr 2010 09:35:17 +0000 Subject: [PATCH] Stylistic changes, harmonizing range_const_iterator -> range_iterator Removing remove_const or adding remove_const.hpp where possible / necessary [SVN r61526] --- include/boost/geometry/algorithms/append.hpp | 2 +- include/boost/geometry/algorithms/area.hpp | 2 +- .../boost/geometry/algorithms/centroid.hpp | 10 +++--- include/boost/geometry/algorithms/convert.hpp | 2 +- .../boost/geometry/algorithms/convex_hull.hpp | 1 - .../algorithms/detail/calculate_sum.hpp | 4 +-- .../detail/sections/get_section.hpp | 4 +-- .../boost/geometry/algorithms/distance.hpp | 34 +++++++++---------- .../boost/geometry/algorithms/envelope.hpp | 2 +- include/boost/geometry/algorithms/length.hpp | 2 +- .../boost/geometry/algorithms/num_points.hpp | 13 +++---- .../algorithms/overlay/clip_linestring.hpp | 2 +- .../algorithms/overlay/copy_segments.hpp | 7 ++-- .../geometry/algorithms/overlay/get_turns.hpp | 21 ++++++------ .../algorithms/overlay/self_turn_points.hpp | 13 +++---- .../boost/geometry/algorithms/simplify.hpp | 10 ++++-- .../boost/geometry/algorithms/transform.hpp | 6 ++-- include/boost/geometry/algorithms/within.hpp | 6 ++-- .../geometry/core/coordinate_dimension.hpp | 8 ++--- .../boost/geometry/core/coordinate_system.hpp | 2 ++ .../boost/geometry/core/coordinate_type.hpp | 1 + .../geometry/core/replace_point_type.hpp | 6 ++-- include/boost/geometry/core/tag.hpp | 2 +- .../geometry/core/topological_dimension.hpp | 1 - .../extensions/algorithms/midpoints.hpp | 2 +- .../extensions/algorithms/selected.hpp | 2 +- .../gis/io/veshape/write_veshape.hpp | 2 +- .../extensions/gis/io/wkt/write_wkt.hpp | 8 +++-- .../extensions/gis/io/wkt/write_wkt_multi.hpp | 2 +- .../geometry/extensions/io/svg/svg_mapper.hpp | 34 ++++++++++--------- .../geometry/extensions/io/svg/write_svg.hpp | 8 ++--- .../extensions/io/svg/write_svg_multi.hpp | 2 +- .../extensions/nsphere/algorithms/within.hpp | 2 +- .../boost/geometry/iterators/range_type.hpp | 2 +- .../geometry/iterators/section_iterators.hpp | 10 +++--- .../geometry/multi/algorithms/centroid.hpp | 2 +- .../multi/algorithms/detail/multi_sum.hpp | 4 +-- .../detail/sections/get_section.hpp | 4 +-- .../detail/sections/sectionalize.hpp | 2 +- .../geometry/multi/algorithms/distance.hpp | 4 +-- .../geometry/multi/algorithms/envelope.hpp | 2 +- .../geometry/multi/algorithms/num_points.hpp | 13 ++++--- .../geometry/multi/algorithms/simplify.hpp | 2 +- .../geometry/multi/algorithms/transform.hpp | 2 +- .../geometry/multi/algorithms/within.hpp | 2 +- .../boost/geometry/multi/util/write_dsv.hpp | 4 +-- .../agnostic/hull_graham_andrew.hpp | 4 +-- .../cartesian/distance_projected_point.hpp | 1 - include/boost/geometry/util/as_range.hpp | 2 +- .../util/range_iterator_const_if_c.hpp | 2 +- include/boost/geometry/util/write_dsv.hpp | 6 ++-- 51 files changed, 147 insertions(+), 144 deletions(-) diff --git a/include/boost/geometry/algorithms/append.hpp b/include/boost/geometry/algorithms/append.hpp index 319d31119..6f1fd4687 100644 --- a/include/boost/geometry/algorithms/append.hpp +++ b/include/boost/geometry/algorithms/append.hpp @@ -63,7 +63,7 @@ struct append_range static inline void apply(Geometry& geometry, Range const& range, int ring_index, int multi_index) { - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it = boost::begin(range); it != boost::end(range); ++it) diff --git a/include/boost/geometry/algorithms/area.hpp b/include/boost/geometry/algorithms/area.hpp index 7b55301d0..568d8b270 100644 --- a/include/boost/geometry/algorithms/area.hpp +++ b/include/boost/geometry/algorithms/area.hpp @@ -122,7 +122,7 @@ struct ring_area return type(); } - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; typename Strategy::state_type state; diff --git a/include/boost/geometry/algorithms/centroid.hpp b/include/boost/geometry/algorithms/centroid.hpp index 4221beab6..fbfd3bbe9 100644 --- a/include/boost/geometry/algorithms/centroid.hpp +++ b/include/boost/geometry/algorithms/centroid.hpp @@ -188,7 +188,7 @@ struct centroid_ring_state static inline void apply(Ring const& ring, Strategy const& strategy, typename Strategy::state_type& state) { - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; iterator_type it = boost::begin(ring); for (iterator_type previous = it++; it != boost::end(ring); @@ -202,7 +202,7 @@ struct centroid_ring_state segment iterator: 1.985 s... typedef segment_iterator < - typename boost::range_const_iterator::type, + typename boost::range_iterator::type, typename point_type::type > iterator_type; @@ -249,7 +249,7 @@ struct centroid_linestring // - be made dim-agnostic typedef typename point_type::type point_type; - typedef typename boost::range_const_iterator::type point_iterator_type; + typedef typename boost::range_iterator::type point_iterator_type; typedef segment_iterator segment_iterator; double length = double(); @@ -293,9 +293,9 @@ struct centroid_polygon_state per_ring::apply(exterior_ring(poly), strategy, state); - for (typename boost::range_const_iterator + for (typename boost::range_iterator < - typename interior_type::type + typename interior_type::type const >::type it = boost::begin(interior_rings(poly)); it != boost::end(interior_rings(poly)); ++it) diff --git a/include/boost/geometry/algorithms/convert.hpp b/include/boost/geometry/algorithms/convert.hpp index 9defc96d6..b214bcc86 100644 --- a/include/boost/geometry/algorithms/convert.hpp +++ b/include/boost/geometry/algorithms/convert.hpp @@ -136,7 +136,7 @@ struct convert static inline void apply(Ring1 const& source, Ring2& destination) { geometry::clear(destination); - for (typename boost::range_const_iterator::type it + for (typename boost::range_iterator::type it = boost::begin(source); it != boost::end(source); ++it) diff --git a/include/boost/geometry/algorithms/convex_hull.hpp b/include/boost/geometry/algorithms/convex_hull.hpp index 05e71a18b..332a77a8c 100644 --- a/include/boost/geometry/algorithms/convex_hull.hpp +++ b/include/boost/geometry/algorithms/convex_hull.hpp @@ -10,7 +10,6 @@ #define BOOST_GEOMETRY_ALGORITHMS_CONVEX_HULL_HPP -#include #include #include diff --git a/include/boost/geometry/algorithms/detail/calculate_sum.hpp b/include/boost/geometry/algorithms/detail/calculate_sum.hpp index 2ed2a3dd0..bfe20f8e2 100644 --- a/include/boost/geometry/algorithms/detail/calculate_sum.hpp +++ b/include/boost/geometry/algorithms/detail/calculate_sum.hpp @@ -32,9 +32,9 @@ struct calculate_polygon_sum { ReturnType sum = Policy::apply(exterior_ring(poly), strategy); - for (typename boost::range_const_iterator + for (typename boost::range_iterator < - typename interior_type::type + typename interior_type::type const >::type it = boost::begin(interior_rings(poly)); it != boost::end(interior_rings(poly)); ++it) diff --git a/include/boost/geometry/algorithms/detail/sections/get_section.hpp b/include/boost/geometry/algorithms/detail/sections/get_section.hpp index 87ae3f782..e862adbcd 100644 --- a/include/boost/geometry/algorithms/detail/sections/get_section.hpp +++ b/include/boost/geometry/algorithms/detail/sections/get_section.hpp @@ -33,9 +33,9 @@ namespace dispatch template struct get_section { - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - typename geometry::range_type::type + typename geometry::range_type::type const >::type iterator_type; static inline void apply(Geometry const& geometry, Section const& section, diff --git a/include/boost/geometry/algorithms/distance.hpp b/include/boost/geometry/algorithms/distance.hpp index 2678732f7..4d4938074 100644 --- a/include/boost/geometry/algorithms/distance.hpp +++ b/include/boost/geometry/algorithms/distance.hpp @@ -9,6 +9,7 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DISTANCE_HPP #define BOOST_GEOMETRY_ALGORITHMS_DISTANCE_HPP + #include #include @@ -111,7 +112,7 @@ struct point_to_range } // line of one point: return point square_distance - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; iterator_type it = boost::begin(range); iterator_type prev = it++; if (it == boost::end(range)) @@ -191,9 +192,9 @@ struct point_to_polygon distance_containment dc = per_ring::apply(point, exterior_ring(polygon), pp_strategy, ps_strategy); - for (typename boost::range_const_iterator + for (typename boost::range_iterator < - typename interior_type::type + typename interior_type::type const >::type it = boost::begin(interior_rings(polygon)); it != boost::end(interior_rings(polygon)); ++it) @@ -422,33 +423,30 @@ template inline typename Strategy::return_type distance(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy) { - typedef typename boost::remove_const::type ncg1_type; - typedef typename boost::remove_const::type ncg2_type; - return boost::mpl::if_ < typename geometry::reverse_dispatch::type, dispatch::distance_reversed < - typename tag::type, - typename tag::type, - ncg1_type, - ncg2_type, + typename tag::type, + typename tag::type, + Geometry1, + Geometry2, typename strategy_tag::type, Strategy, - is_multi::value, - is_multi::value + is_multi::value, + is_multi::value >, dispatch::distance < - typename tag::type, - typename tag::type, - ncg1_type, - ncg2_type, + typename tag::type, + typename tag::type, + Geometry1, + Geometry2, typename strategy_tag::type, Strategy, - is_multi::value, - is_multi::value + is_multi::value, + is_multi::value > >::type::apply(geometry1, geometry2, strategy); } diff --git a/include/boost/geometry/algorithms/envelope.hpp b/include/boost/geometry/algorithms/envelope.hpp index 412f81e78..6ad91cf6e 100644 --- a/include/boost/geometry/algorithms/envelope.hpp +++ b/include/boost/geometry/algorithms/envelope.hpp @@ -80,7 +80,7 @@ struct envelope_combine_one template inline void envelope_range_additional(Range const& range, Box& mbr) { - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; for (iterator_type it = boost::begin(range); it != boost::end(range); diff --git a/include/boost/geometry/algorithms/length.hpp b/include/boost/geometry/algorithms/length.hpp index c6994a4af..5ebd7f9c5 100644 --- a/include/boost/geometry/algorithms/length.hpp +++ b/include/boost/geometry/algorithms/length.hpp @@ -81,7 +81,7 @@ struct range_length { return_type sum = return_type(); - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; iterator_type it = boost::begin(range); if (it != boost::end(range)) { diff --git a/include/boost/geometry/algorithms/num_points.hpp b/include/boost/geometry/algorithms/num_points.hpp index f28a1c8d5..971447ef4 100644 --- a/include/boost/geometry/algorithms/num_points.hpp +++ b/include/boost/geometry/algorithms/num_points.hpp @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -52,9 +51,9 @@ struct polygon_count static inline std::size_t apply(Polygon const& poly) { std::size_t n = boost::size(exterior_ring(poly)); - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - typename interior_type::type + typename interior_type::type const >::type iterator; for (iterator it = boost::begin(interior_rings(poly)); @@ -129,15 +128,13 @@ struct num_points template inline std::size_t num_points(Geometry const& geometry) { - concept::check(); - - typedef typename boost::remove_const::type ncg_type; + concept::check(); return dispatch::num_points < typename tag::type, - is_linear::value, - ncg_type + is_linear::value, + Geometry >::apply(geometry); } diff --git a/include/boost/geometry/algorithms/overlay/clip_linestring.hpp b/include/boost/geometry/algorithms/overlay/clip_linestring.hpp index c827d3455..e0cbb599e 100644 --- a/include/boost/geometry/algorithms/overlay/clip_linestring.hpp +++ b/include/boost/geometry/algorithms/overlay/clip_linestring.hpp @@ -173,7 +173,7 @@ OutputIterator clip_linestring_with_box(Box const& b, Linestring const& linestri OutputLinestring line_out; - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; iterator_type vertex = boost::begin(linestring); for(iterator_type previous = vertex++; vertex != boost::end(linestring); diff --git a/include/boost/geometry/algorithms/overlay/copy_segments.hpp b/include/boost/geometry/algorithms/overlay/copy_segments.hpp index a15ad304d..df0b93904 100644 --- a/include/boost/geometry/algorithms/overlay/copy_segments.hpp +++ b/include/boost/geometry/algorithms/overlay/copy_segments.hpp @@ -44,7 +44,7 @@ struct copy_segments_ring SegmentIdentifier const& seg_id, int to_index, RangeOut& current_output) { - typedef typename boost::range_const_iterator::type iterator; + typedef typename boost::range_iterator::type iterator; typedef geometry::ever_circling_iterator ec_iterator; @@ -64,11 +64,12 @@ struct copy_segments_ring // [2..4] -> 4 - 2 + 1 = 3 -> {2,3,4} -> OK // [4..2],size=6 -> 6 - 4 + 2 + 1 = 5 -> {4,5,0,1,2} -> OK // [1..1], travel the whole ring round - int count = from_index <= to_index + typedef typename boost::range_difference::type size_type; + size_type count = from_index <= to_index ? to_index - from_index + 1 : boost::size(ring) - from_index + to_index + 1; - for (int i = 0; i < count; ++i, ++it) + for (size_type i = 0; i < count; ++i, ++it) { #ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION std::cout << " add: (" diff --git a/include/boost/geometry/algorithms/overlay/get_turns.hpp b/include/boost/geometry/algorithms/overlay/get_turns.hpp index f6e0fd000..4052f19bd 100644 --- a/include/boost/geometry/algorithms/overlay/get_turns.hpp +++ b/include/boost/geometry/algorithms/overlay/get_turns.hpp @@ -16,7 +16,6 @@ #include #include -#include #include #include @@ -102,14 +101,14 @@ public : InterruptPolicy& interrupt_policy) { - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - typename geometry::range_type::type + typename geometry::range_type::type const >::type range1_iterator; - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - typename geometry::range_type::type + typename geometry::range_type::type const >::type range2_iterator; int const dir1 = sec1.directions[0]; @@ -341,12 +340,12 @@ class get_turns_generic Sections1 const& sec1, Sections2 const& sec2, Map& map) { - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it1 = sec1.begin(); it1 != sec1.end(); ++it1) { - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it2 = sec2.begin(); it2 != sec2.end(); ++it2) @@ -703,9 +702,9 @@ struct get_turns { typedef typename geometry::ring_type::type ring_type; - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - typename interior_type::type + typename interior_type::type const >::type iterator_type; @@ -760,9 +759,9 @@ struct get_turns int source_id2, Box const& box, Turns& turns, InterruptPolicy& interrupt_policy) { - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - Ring + Ring const >::type iterator_type; typedef detail::get_turns::get_turns_cs diff --git a/include/boost/geometry/algorithms/overlay/self_turn_points.hpp b/include/boost/geometry/algorithms/overlay/self_turn_points.hpp index e0aaa164c..c119e3509 100644 --- a/include/boost/geometry/algorithms/overlay/self_turn_points.hpp +++ b/include/boost/geometry/algorithms/overlay/self_turn_points.hpp @@ -12,8 +12,6 @@ #include -#include - #include #include #include @@ -55,12 +53,12 @@ struct get_turns sections_type sec; geometry::sectionalize(geometry, sec); - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it1 = sec.begin(); it1 != sec.end(); ++it1) { - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it2 = sec.begin(); it2 != sec.end(); ++it2) @@ -198,13 +196,12 @@ inline void get_turns(Geometry const& geometry, typename boost::range_value::type >::segment_intersection_strategy_type strategy_type; - typedef typename boost::remove_const::type ncg_type; dispatch::self_get_turn_points < - typename tag::type, - is_multi::type::value, - ncg_type, + typename tag::type, + is_multi::type::value, + Geometry, Turns, strategy_type, AssignPolicy, InterruptPolicy >::apply(geometry, turns, interrupt_policy); diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp index 0c098a505..3b296f16a 100644 --- a/include/boost/geometry/algorithms/simplify.hpp +++ b/include/boost/geometry/algorithms/simplify.hpp @@ -150,9 +150,13 @@ struct simplify_polygon typedef typename ring_type::type ring_type; typedef typename boost::range_iterator - ::type>::type iterator_type; - typedef typename boost::range_const_iterator - ::type>::type const_iterator_type; + < + typename interior_type::type + >::type iterator_type; + typedef typename boost::range_iterator + < + typename interior_type::type const + >::type const_iterator_type; // Note that if there are inner rings, and distance is too large, // they might intersect with the outer ring in the output, diff --git a/include/boost/geometry/algorithms/transform.hpp b/include/boost/geometry/algorithms/transform.hpp index 80cbeb12d..e0114c465 100644 --- a/include/boost/geometry/algorithms/transform.hpp +++ b/include/boost/geometry/algorithms/transform.hpp @@ -128,7 +128,7 @@ inline bool transform_range_out(Range const& range, OutputIterator out, Strategy const& strategy) { PointOut point_out; - for(typename boost::range_const_iterator::type + for(typename boost::range_iterator::type it = boost::begin(range); it != boost::end(range); ++it) @@ -170,9 +170,9 @@ struct transform_polygon interior_rings(poly2).resize(num_interior_rings(poly1)); - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - interior1_type + interior1_type const >::type iterator1_type; typedef typename boost::range_iterator < diff --git a/include/boost/geometry/algorithms/within.hpp b/include/boost/geometry/algorithms/within.hpp index b7127d23f..578e7c821 100644 --- a/include/boost/geometry/algorithms/within.hpp +++ b/include/boost/geometry/algorithms/within.hpp @@ -181,7 +181,7 @@ struct point_in_ring return false; } - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; typename Strategy::state_type state; @@ -219,9 +219,9 @@ struct point_in_polygon if (per_ring::apply(point, exterior_ring(poly), strategy)) { - for (typename boost::range_const_iterator + for (typename boost::range_iterator < - typename interior_type::type + typename interior_type::type const >::type it = boost::begin(interior_rings(poly)); it != boost::end(interior_rings(poly)); ++it) diff --git a/include/boost/geometry/core/coordinate_dimension.hpp b/include/boost/geometry/core/coordinate_dimension.hpp index 8003febca..86eb2a2a9 100644 --- a/include/boost/geometry/core/coordinate_dimension.hpp +++ b/include/boost/geometry/core/coordinate_dimension.hpp @@ -59,8 +59,8 @@ template struct dimension : core_dispatch::dimension < - typename tag::type, - typename boost::remove_const::type + typename tag::type, + typename boost::remove_const::type > {}; @@ -74,8 +74,8 @@ inline void assert_dimension() BOOST_STATIC_ASSERT(( boost::mpl::equal_to < - geometry::dimension, - boost::mpl::int_ + geometry::dimension, + boost::mpl::int_ >::type::value )); } diff --git a/include/boost/geometry/core/coordinate_system.hpp b/include/boost/geometry/core/coordinate_system.hpp index a18b2ffa2..e1e0152a9 100644 --- a/include/boost/geometry/core/coordinate_system.hpp +++ b/include/boost/geometry/core/coordinate_system.hpp @@ -18,6 +18,7 @@ namespace boost { namespace geometry { + namespace traits { @@ -75,6 +76,7 @@ struct coordinate_system >::type type; }; + }} // namespace boost::geometry diff --git a/include/boost/geometry/core/coordinate_type.hpp b/include/boost/geometry/core/coordinate_type.hpp index 3bba6a291..5c3df6fca 100644 --- a/include/boost/geometry/core/coordinate_type.hpp +++ b/include/boost/geometry/core/coordinate_type.hpp @@ -9,6 +9,7 @@ #ifndef BOOST_GEOMETRY_CORE_COORDINATE_TYPE_HPP #define BOOST_GEOMETRY_CORE_COORDINATE_TYPE_HPP + #include #include diff --git a/include/boost/geometry/core/replace_point_type.hpp b/include/boost/geometry/core/replace_point_type.hpp index 81669ab38..2d19d97b4 100644 --- a/include/boost/geometry/core/replace_point_type.hpp +++ b/include/boost/geometry/core/replace_point_type.hpp @@ -82,9 +82,9 @@ struct replace_point_type template struct replace_point_type : core_dispatch::replace_point_type < - typename tag::type, - typename boost::remove_const::type, - NewPointType + typename tag::type, + typename boost::remove_const::type, + NewPointType > {}; diff --git a/include/boost/geometry/core/tag.hpp b/include/boost/geometry/core/tag.hpp index 8e9ccf4b7..c189a124d 100644 --- a/include/boost/geometry/core/tag.hpp +++ b/include/boost/geometry/core/tag.hpp @@ -56,7 +56,7 @@ struct tag { typedef typename traits::tag < - typename boost::remove_const::type + typename boost::remove_const::type >::type type; }; diff --git a/include/boost/geometry/core/topological_dimension.hpp b/include/boost/geometry/core/topological_dimension.hpp index 4a6cf9c36..6d96276a3 100644 --- a/include/boost/geometry/core/topological_dimension.hpp +++ b/include/boost/geometry/core/topological_dimension.hpp @@ -12,7 +12,6 @@ #include -#include #include diff --git a/include/boost/geometry/extensions/algorithms/midpoints.hpp b/include/boost/geometry/extensions/algorithms/midpoints.hpp index 37b6a31fc..68133d618 100644 --- a/include/boost/geometry/extensions/algorithms/midpoints.hpp +++ b/include/boost/geometry/extensions/algorithms/midpoints.hpp @@ -59,7 +59,7 @@ struct range_midpoints bool start_and_end, Iterator out) { typedef typename point_type::type point_type; - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; iterator_type it = boost::begin(range); diff --git a/include/boost/geometry/extensions/algorithms/selected.hpp b/include/boost/geometry/extensions/algorithms/selected.hpp index 91792f243..0d3a0be1a 100644 --- a/include/boost/geometry/extensions/algorithms/selected.hpp +++ b/include/boost/geometry/extensions/algorithms/selected.hpp @@ -181,7 +181,7 @@ struct close_to_range } typedef typename point_type::type point_type; - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; iterator_type it = boost::begin(range); if (n == 1) diff --git a/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp b/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp index 1cd135538..65116381c 100644 --- a/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp +++ b/include/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp @@ -136,7 +136,7 @@ struct veshape_range template static inline void stream(std::basic_ostream& os, R const& range) { - typedef typename boost::range_const_iterator::type iterator; + typedef typename boost::range_iterator::type iterator; bool first = true; diff --git a/include/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp b/include/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp index 5006c0691..16dace40f 100644 --- a/include/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp +++ b/include/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp @@ -114,7 +114,7 @@ struct wkt_range static inline void apply(std::basic_ostream& os, Range const& range) { - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; bool first = true; @@ -167,8 +167,10 @@ struct wkt_poly Polygon const& poly) { typedef typename ring_type::type ring; - typedef typename boost::range_const_iterator< - typename interior_type::type>::type iterator; + typedef typename boost::range_iterator + < + typename interior_type::type const + >::type iterator; os << PrefixPolicy::apply(); // TODO: check EMPTY here diff --git a/include/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp b/include/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp index 341dba149..a4643fbb3 100644 --- a/include/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp +++ b/include/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp @@ -35,7 +35,7 @@ struct wkt_multi // TODO: check EMPTY here os << "("; - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it = boost::begin(geometry); it != boost::end(geometry); ++it) diff --git a/include/boost/geometry/extensions/io/svg/svg_mapper.hpp b/include/boost/geometry/extensions/io/svg/svg_mapper.hpp index c1c9ad762..ebb6668b9 100644 --- a/include/boost/geometry/extensions/io/svg/svg_mapper.hpp +++ b/include/boost/geometry/extensions/io/svg/svg_mapper.hpp @@ -12,7 +12,9 @@ #include + #include +#include #include #include @@ -188,18 +190,18 @@ class svg_mapper : boost::noncopyable { if (! m_matrix) { - m_matrix.reset(new transformer_type(m_bounding_box, + m_matrix.reset(new transformer_type(m_bounding_box, m_width, m_height)); - m_stream << "" + m_stream << "" << std::endl - << "" + << "\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" << std::endl - << "" + << "xmlns=\"http://www.w3.org/2000/svg\">" << std::endl; } } @@ -223,16 +225,16 @@ public : { if (boost::geometry::num_points(geometry) > 0) { - boost::geometry::combine(m_bounding_box, + boost::geometry::combine(m_bounding_box, boost::geometry::make_envelope < - boost::geometry::box + boost::geometry::box >(geometry)); } } template - void map(Geometry const& geometry, std::string const& style, + void map(Geometry const& geometry, std::string const& style, int size = -1) { init_matrix(); @@ -240,14 +242,14 @@ public : } template - void text(TextPoint const& point, std::string const& s, + void text(TextPoint const& point, std::string const& s, std::string const& style, int offset_x = 0, int offset_y = 0, int lineheight = 10) { init_matrix(); map_point_type map_point; boost::geometry::transform(point, map_point, *m_matrix); - m_stream + m_stream << "(map_point) + offset_x << "\"" << " y=\"" << boost::geometry::get<1>(map_point) + offset_y << "\"" @@ -264,13 +266,13 @@ public : boost::split(splitted, s, boost::is_any_of("\n")); for (std::vector::const_iterator it = splitted.begin(); - it != splitted.end(); + it != splitted.end(); ++it, offset_y += lineheight) { - m_stream - << "(map_point) + offset_x - << "\"" - << " y=\"" << boost::geometry::get<1>(map_point) + offset_y + m_stream + << "(map_point) + offset_x + << "\"" + << " y=\"" << boost::geometry::get<1>(map_point) + offset_y << "\"" << ">" << *it << ""; } diff --git a/include/boost/geometry/extensions/io/svg/write_svg.hpp b/include/boost/geometry/extensions/io/svg/write_svg.hpp index 376f11bad..89f75e521 100644 --- a/include/boost/geometry/extensions/io/svg/write_svg.hpp +++ b/include/boost/geometry/extensions/io/svg/write_svg.hpp @@ -86,7 +86,7 @@ struct svg_range static inline void apply(std::basic_ostream& os, Range const& range, std::string const& style, int size) { - typedef typename boost::range_const_iterator::type iterator; + typedef typename boost::range_iterator::type iterator; bool first = true; @@ -115,7 +115,7 @@ struct svg_poly Polygon const& polygon, std::string const& style, int size) { typedef typename geometry::ring_type::type ring_type; - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; bool first = true; os << "::type + typename geometry::interior_type::type const >::type ring_iterator_type; for (ring_iterator_type rit = boost::begin(interior_rings(polygon)); rit != boost::end(interior_rings(polygon)); diff --git a/include/boost/geometry/extensions/io/svg/write_svg_multi.hpp b/include/boost/geometry/extensions/io/svg/write_svg_multi.hpp index beb58c271..83f9dd17d 100644 --- a/include/boost/geometry/extensions/io/svg/write_svg_multi.hpp +++ b/include/boost/geometry/extensions/io/svg/write_svg_multi.hpp @@ -28,7 +28,7 @@ struct svg_multi static inline void apply(std::basic_ostream& os, MultiGeometry const& multi, std::string const& style, int size) { - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it = boost::begin(multi); it != boost::end(multi); ++it) diff --git a/include/boost/geometry/extensions/nsphere/algorithms/within.hpp b/include/boost/geometry/extensions/nsphere/algorithms/within.hpp index 3cd1ffdf8..c949a6cf6 100644 --- a/include/boost/geometry/extensions/nsphere/algorithms/within.hpp +++ b/include/boost/geometry/extensions/nsphere/algorithms/within.hpp @@ -90,7 +90,7 @@ inline bool range_in_circle(R const& range, C const& c) assert_dimension(); assert_dimension(); - for (typename boost::range_const_iterator::type it = boost::begin(range); + for (typename boost::range_iterator::type it = boost::begin(range); it != boost::end(range); ++it) { if (! point_in_circle(*it, c)) diff --git a/include/boost/geometry/iterators/range_type.hpp b/include/boost/geometry/iterators/range_type.hpp index d7965d202..b4c3ef571 100644 --- a/include/boost/geometry/iterators/range_type.hpp +++ b/include/boost/geometry/iterators/range_type.hpp @@ -8,8 +8,8 @@ #ifndef BOOST_GEOMETRY_ITERATORS_RANGE_TYPE_HPP #define BOOST_GEOMETRY_ITERATORS_RANGE_TYPE_HPP + #include -#include #include #include diff --git a/include/boost/geometry/iterators/section_iterators.hpp b/include/boost/geometry/iterators/section_iterators.hpp index 35f0503b5..9820be1cc 100644 --- a/include/boost/geometry/iterators/section_iterators.hpp +++ b/include/boost/geometry/iterators/section_iterators.hpp @@ -45,7 +45,7 @@ namespace detail template struct section_iterator : public detail::iterators::iterator_base< section_iterator, - typename boost::range_const_iterator::type + typename boost::range_iterator::type > { friend class boost::iterator_core_access; @@ -112,8 +112,8 @@ struct section_iterator : public detail::iterators::iterator_base< } - typedef typename boost::range_const_iterator::type IT; - typedef typename boost::range_const_iterator::type SIT; + typedef typename boost::range_iterator::type IT; + typedef typename boost::range_iterator::type SIT; const G& m_ring; const S& m_sections; @@ -129,10 +129,10 @@ struct section_iterator : public detail::iterators::iterator_base< template struct one_section_segment_iterator : public detail::iterators::iterator_base< one_section_segment_iterator - , typename boost::range_const_iterator::type> + , typename boost::range_iterator::type> { friend class boost::iterator_core_access; - typedef typename boost::range_const_iterator::type normal_iterator; + typedef typename boost::range_iterator::type normal_iterator; inline one_section_segment_iterator(const G& ring, const SEC& section, const B& box) : m_box(&box) diff --git a/include/boost/geometry/multi/algorithms/centroid.hpp b/include/boost/geometry/multi/algorithms/centroid.hpp index 6fc70a568..23eaf8c0a 100644 --- a/include/boost/geometry/multi/algorithms/centroid.hpp +++ b/include/boost/geometry/multi/algorithms/centroid.hpp @@ -77,7 +77,7 @@ struct centroid_multi typename Strategy::state_type state; - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it = boost::begin(multi); it != boost::end(multi); ++it) diff --git a/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp b/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp index ab66d23a0..e1b52f7d2 100644 --- a/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp +++ b/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp @@ -30,9 +30,9 @@ struct multi_sum static inline ReturnType apply(MultiGeometry const& geometry, Strategy const& strategy) { ReturnType sum = ReturnType(); - for (typename boost::range_const_iterator + for (typename boost::range_iterator < - MultiGeometry + MultiGeometry const >::type it = boost::begin(geometry); it != boost::end(geometry); ++it) diff --git a/include/boost/geometry/multi/algorithms/detail/sections/get_section.hpp b/include/boost/geometry/multi/algorithms/detail/sections/get_section.hpp index b651206b2..25ab40ce5 100644 --- a/include/boost/geometry/multi/algorithms/detail/sections/get_section.hpp +++ b/include/boost/geometry/multi/algorithms/detail/sections/get_section.hpp @@ -31,9 +31,9 @@ namespace dispatch template struct get_section { - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - typename geometry::range_type::type + typename geometry::range_type::type const >::type iterator_type; static inline void apply(MultiPolygon const& multi_polygon, diff --git a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp index ab4e92a9e..422239dbf 100644 --- a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp +++ b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp @@ -33,7 +33,7 @@ struct sectionalize_multi static inline void apply(MultiGeometry const& multi, Sections& sections) { int multi_index = 0; - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it = boost::begin(multi); it != boost::end(multi); ++it, ++multi_index) diff --git a/include/boost/geometry/multi/algorithms/distance.hpp b/include/boost/geometry/multi/algorithms/distance.hpp index b2526b3c8..1971b0091 100644 --- a/include/boost/geometry/multi/algorithms/distance.hpp +++ b/include/boost/geometry/multi/algorithms/distance.hpp @@ -50,7 +50,7 @@ struct distance_single_to_multi >::type >::highest()); - for(typename range_const_iterator::type it = begin(multi); + for(typename range_iterator::type it = begin(multi); it != end(multi); ++it) { @@ -85,7 +85,7 @@ struct distance_multi_to_multi >::type >::highest()); - for(typename range_const_iterator::type it = begin(multi1); + for(typename range_iterator::type it = begin(multi1); it != end(multi1); ++it) { diff --git a/include/boost/geometry/multi/algorithms/envelope.hpp b/include/boost/geometry/multi/algorithms/envelope.hpp index 7a135ef8e..59fdd4073 100644 --- a/include/boost/geometry/multi/algorithms/envelope.hpp +++ b/include/boost/geometry/multi/algorithms/envelope.hpp @@ -35,7 +35,7 @@ struct envelope_multi_linestring static inline void apply(MultiLinestring const& mp, Box& mbr) { assign_inverse(mbr); - for (typename boost::range_const_iterator::type + for (typename boost::range_iterator::type it = mp.begin(); it != mp.end(); ++it) diff --git a/include/boost/geometry/multi/algorithms/num_points.hpp b/include/boost/geometry/multi/algorithms/num_points.hpp index 889e9d728..b0c6d7614 100644 --- a/include/boost/geometry/multi/algorithms/num_points.hpp +++ b/include/boost/geometry/multi/algorithms/num_points.hpp @@ -31,10 +31,9 @@ struct multi_count static inline size_t apply(MultiGeometry const& geometry) { typedef typename boost::range_value::type geometry_type; - typedef typename boost::remove_const::type ncg; - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - MultiGeometry + MultiGeometry const >::type iterator_type; size_t n = 0; @@ -42,8 +41,12 @@ struct multi_count it != boost::end(geometry); ++it) { - n += dispatch::num_points::type, - geometry::is_linear::value, ncg>::apply(*it); + n += dispatch::num_points + < + typename tag::type, + geometry::is_linear::value, + geometry_type + >::apply(*it); } return n; } diff --git a/include/boost/geometry/multi/algorithms/simplify.hpp b/include/boost/geometry/multi/algorithms/simplify.hpp index a1baadf42..682a093bc 100644 --- a/include/boost/geometry/multi/algorithms/simplify.hpp +++ b/include/boost/geometry/multi/algorithms/simplify.hpp @@ -36,7 +36,7 @@ struct simplify_multi typename boost::range_iterator::type it_out = boost::begin(out); - for (typename boost::range_const_iterator::type it_in + for (typename boost::range_iterator::type it_in = boost::begin(multi); it_in != boost::end(multi); ++it_in, ++it_out) diff --git a/include/boost/geometry/multi/algorithms/transform.hpp b/include/boost/geometry/multi/algorithms/transform.hpp index 1aad296e6..7b0db4f9f 100644 --- a/include/boost/geometry/multi/algorithms/transform.hpp +++ b/include/boost/geometry/multi/algorithms/transform.hpp @@ -33,7 +33,7 @@ struct transform_multi { multi2.resize(boost::size(multi1)); - typename boost::range_const_iterator::type it1 + typename boost::range_iterator::type it1 = boost::begin(multi1); typename boost::range_iterator::type it2 = boost::begin(multi2); diff --git a/include/boost/geometry/multi/algorithms/within.hpp b/include/boost/geometry/multi/algorithms/within.hpp index 8929f991d..da74def93 100644 --- a/include/boost/geometry/multi/algorithms/within.hpp +++ b/include/boost/geometry/multi/algorithms/within.hpp @@ -36,7 +36,7 @@ struct geometry_in_multi MultiGeometry const& multi, Strategy const& strategy) { - for (typename boost::range_const_iterator::type it + for (typename boost::range_iterator::type it = boost::begin(multi); it != boost::end(multi); ++it) diff --git a/include/boost/geometry/multi/util/write_dsv.hpp b/include/boost/geometry/multi/util/write_dsv.hpp index 6b1ecc751..c5b31509e 100644 --- a/include/boost/geometry/multi/util/write_dsv.hpp +++ b/include/boost/geometry/multi/util/write_dsv.hpp @@ -31,9 +31,9 @@ struct dsv_multi { os << settings.list_open; - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - MultiGeometry + MultiGeometry const >::type iterator; for(iterator it = boost::begin(multi); it != boost::end(multi); diff --git a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp index 50a7d5dbc..14c9c3c82 100644 --- a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp +++ b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp @@ -275,9 +275,9 @@ public: typedef typename range_type::type range_type; - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - range_type + range_type const >::type range_iterator; detail::get_extremes diff --git a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp index abb8575b8..72b3c3007 100644 --- a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp +++ b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/include/boost/geometry/util/as_range.hpp b/include/boost/geometry/util/as_range.hpp index d273de364..69730c5d6 100644 --- a/include/boost/geometry/util/as_range.hpp +++ b/include/boost/geometry/util/as_range.hpp @@ -9,8 +9,8 @@ #ifndef BOOST_GEOMETRY_UTIL_AS_RANGE_HPP #define BOOST_GEOMETRY_UTIL_AS_RANGE_HPP + #include -#include #include #include diff --git a/include/boost/geometry/util/range_iterator_const_if_c.hpp b/include/boost/geometry/util/range_iterator_const_if_c.hpp index e7b22cecf..d6368038f 100644 --- a/include/boost/geometry/util/range_iterator_const_if_c.hpp +++ b/include/boost/geometry/util/range_iterator_const_if_c.hpp @@ -32,7 +32,7 @@ struct range_iterator_const_if_c typedef typename boost::mpl::if_c < IsConst, - typename boost::range_const_iterator::type, + typename boost::range_iterator::type, typename boost::range_iterator::type >::type type; }; diff --git a/include/boost/geometry/util/write_dsv.hpp b/include/boost/geometry/util/write_dsv.hpp index b0ae2a8b6..bd118c875 100644 --- a/include/boost/geometry/util/write_dsv.hpp +++ b/include/boost/geometry/util/write_dsv.hpp @@ -162,7 +162,7 @@ struct dsv_range Range const& range, dsv_settings const& settings) { - typedef typename boost::range_const_iterator::type iterator_type; + typedef typename boost::range_iterator::type iterator_type; bool first = true; @@ -206,9 +206,9 @@ struct dsv_poly dsv_settings const& settings) { typedef typename ring_type::type ring; - typedef typename boost::range_const_iterator + typedef typename boost::range_iterator < - typename interior_type::type + typename interior_type::type const >::type iterator_type; os << settings.list_open;