Subject: [Boost-commit] svn:boost r61511 - in sandbox/geometry/boost/geometry: algorithms algorithms/detail algorithms/detail/buffer algorithms/detail/equals algorithms/detail/overlay algorithms/detail/sections algorithms/overlay core extensions/algorithms extensions/gis/io/veshape extensions/gis/io/wkt extensions/gis/projections/impl extensions/io/svg geometries geometries/concepts iterators multi/algorithms multi/algorithms/detail multi/algorithms/detail/sections multi/algorithms/overlay multi/core multi/geometries/concepts multi/iterators multi/util strategies/agnostic util
From: barend.gehrels_at_[hidden]
Date: 2010-04-23 13:47:44
Author: barendgehrels
Date: 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
New Revision: 61511
URL: http://svn.boost.org/trac/boost/changeset/61511
Log:
Added boost/range.hpp where necessary (often replaces /functions and /metafunctions)
Some stylistic changes
Text files modified:
sandbox/geometry/boost/geometry/algorithms/append.hpp | 4 ++--
sandbox/geometry/boost/geometry/algorithms/centroid.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/convert.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/correct.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/detail/buffer/linestring_buffer.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/detail/buffer/polygon_buffer.hpp | 7 +++----
sandbox/geometry/boost/geometry/algorithms/detail/buffer/remove_within_distance.hpp | 7 +++++--
sandbox/geometry/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/detail/calculate_sum.hpp | 3 +++
sandbox/geometry/boost/geometry/algorithms/detail/disjoint.hpp | 2 ++
sandbox/geometry/boost/geometry/algorithms/detail/equals/collect_vectors.hpp | 3 ---
sandbox/geometry/boost/geometry/algorithms/detail/overlay/dissolver.hpp | 2 ++
sandbox/geometry/boost/geometry/algorithms/detail/overlay/split_rings.hpp | 2 ++
sandbox/geometry/boost/geometry/algorithms/detail/point_on_border.hpp | 2 +-
sandbox/geometry/boost/geometry/algorithms/detail/sections/get_full_section.hpp | 4 +---
sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp | 4 +---
sandbox/geometry/boost/geometry/algorithms/detail/sections/sectionalize.hpp | 7 +++----
sandbox/geometry/boost/geometry/algorithms/disjoint.hpp | 4 ++--
sandbox/geometry/boost/geometry/algorithms/dissolve.hpp | 2 ++
sandbox/geometry/boost/geometry/algorithms/distance.hpp | 14 +++++++-------
sandbox/geometry/boost/geometry/algorithms/envelope.hpp | 4 ++--
sandbox/geometry/boost/geometry/algorithms/equals.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/for_each.hpp | 4 +++-
sandbox/geometry/boost/geometry/algorithms/intersection.hpp | 3 ++-
sandbox/geometry/boost/geometry/algorithms/length.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/num_points.hpp | 3 ++-
sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp | 3 +++
sandbox/geometry/boost/geometry/algorithms/overlay/clip_linestring.hpp | 6 +++---
sandbox/geometry/boost/geometry/algorithms/overlay/copy_segment_point.hpp | 2 ++
sandbox/geometry/boost/geometry/algorithms/overlay/copy_segments.hpp | 1 +
sandbox/geometry/boost/geometry/algorithms/overlay/enrich_intersection_points.hpp | 4 ++--
sandbox/geometry/boost/geometry/algorithms/overlay/get_turns.hpp | 4 ++--
sandbox/geometry/boost/geometry/algorithms/overlay/self_turn_points.hpp | 4 ++--
sandbox/geometry/boost/geometry/algorithms/overlay/traverse.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/reverse.hpp | 2 --
sandbox/geometry/boost/geometry/algorithms/simplify.hpp | 4 +---
sandbox/geometry/boost/geometry/algorithms/transform.hpp | 3 +--
sandbox/geometry/boost/geometry/algorithms/union.hpp | 4 +++-
sandbox/geometry/boost/geometry/algorithms/unique.hpp | 2 --
sandbox/geometry/boost/geometry/algorithms/within.hpp | 3 +--
sandbox/geometry/boost/geometry/core/interior_rings.hpp | 2 +-
sandbox/geometry/boost/geometry/core/point_order.hpp | 10 ++++++----
sandbox/geometry/boost/geometry/core/point_type.hpp | 10 +++++-----
sandbox/geometry/boost/geometry/extensions/algorithms/connect.hpp | 4 +---
sandbox/geometry/boost/geometry/extensions/algorithms/midpoints.hpp | 3 +--
sandbox/geometry/boost/geometry/extensions/algorithms/remove_spikes.hpp | 2 --
sandbox/geometry/boost/geometry/extensions/algorithms/selected.hpp | 3 +--
sandbox/geometry/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp | 4 ++--
sandbox/geometry/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp | 4 ++--
sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp | 4 ++--
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_init.hpp | 2 +-
sandbox/geometry/boost/geometry/extensions/io/svg/write_svg.hpp | 4 ++--
sandbox/geometry/boost/geometry/geometries/concepts/linestring_concept.hpp | 5 +++--
sandbox/geometry/boost/geometry/geometries/concepts/ring_concept.hpp | 2 +-
sandbox/geometry/boost/geometry/geometries/linestring.hpp | 2 +-
sandbox/geometry/boost/geometry/iterators/section_iterators.hpp | 2 ++
sandbox/geometry/boost/geometry/multi/algorithms/area.hpp | 7 ++++++-
sandbox/geometry/boost/geometry/multi/algorithms/centroid.hpp | 9 +++++++--
sandbox/geometry/boost/geometry/multi/algorithms/detail/modify.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp | 6 +++---
sandbox/geometry/boost/geometry/multi/algorithms/detail/multi_sum.hpp | 4 ++--
sandbox/geometry/boost/geometry/multi/algorithms/detail/point_on_border.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_full_section.hpp | 5 +----
sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_section.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/dissolve.hpp | 2 ++
sandbox/geometry/boost/geometry/multi/algorithms/distance.hpp | 7 +++----
sandbox/geometry/boost/geometry/multi/algorithms/envelope.hpp | 3 +++
sandbox/geometry/boost/geometry/multi/algorithms/for_each.hpp | 5 ++++-
sandbox/geometry/boost/geometry/multi/algorithms/length.hpp | 4 ++++
sandbox/geometry/boost/geometry/multi/algorithms/num_points.hpp | 2 ++
sandbox/geometry/boost/geometry/multi/algorithms/overlay/assemble.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segment_point.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segments.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/perimeter.hpp | 3 +++
sandbox/geometry/boost/geometry/multi/algorithms/reverse.hpp | 1 -
sandbox/geometry/boost/geometry/multi/algorithms/simplify.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/transform.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/unique.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/algorithms/within.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/core/interior_rings.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/core/num_geometries.hpp | 4 ++--
sandbox/geometry/boost/geometry/multi/core/point_type.hpp | 1 -
sandbox/geometry/boost/geometry/multi/core/ring_type.hpp | 1 -
sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp | 1 -
sandbox/geometry/boost/geometry/multi/iterators/range_type.hpp | 3 +--
sandbox/geometry/boost/geometry/multi/util/for_each_range.hpp | 5 ++++-
sandbox/geometry/boost/geometry/multi/util/write_dsv.hpp | 3 +--
sandbox/geometry/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp | 3 +--
sandbox/geometry/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp | 2 +-
sandbox/geometry/boost/geometry/util/range_iterator_const_if_c.hpp | 3 +--
sandbox/geometry/boost/geometry/util/reversible_view.hpp | 4 ++--
sandbox/geometry/boost/geometry/util/write_dsv.hpp | 3 +--
94 files changed, 172 insertions(+), 168 deletions(-)
Modified: sandbox/geometry/boost/geometry/algorithms/append.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/append.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/append.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,8 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_APPEND_HPP
#define BOOST_GEOMETRY_ALGORITHMS_APPEND_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/type_traits/remove_const.hpp>
#include <boost/geometry/core/access.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/centroid.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/centroid.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/centroid.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/core/cs.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/convert.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/convert.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/convert.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <cstddef>
#include <boost/numeric/conversion/cast.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/append.hpp>
#include <boost/geometry/algorithms/assign.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/correct.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/correct.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/correct.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,8 +13,7 @@
#include <algorithm>
#include <functional>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/core/ring_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,8 +11,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/ring_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/buffer/linestring_buffer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/buffer/linestring_buffer.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/buffer/linestring_buffer.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <boost/numeric/conversion/cast.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/point_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/buffer/polygon_buffer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/buffer/polygon_buffer.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/buffer/polygon_buffer.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <boost/numeric/conversion/cast.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/point_type.hpp>
@@ -42,7 +41,7 @@
template <typename Mapper>
#endif
static inline void apply(RingInput const& ring, RingOutput& buffered,
- coordinate_type distance,
+ coordinate_type distance,
JoinStrategy const& join_strategy
#ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER
, Mapper& mapper
@@ -184,7 +183,7 @@
template <typename Mapper>
#endif
static inline void apply(PolygonInput const& polygon, PolygonOutput& buffered,
- typename coordinate_type<PolygonOutput>::type distance,
+ typename coordinate_type<PolygonOutput>::type distance,
JoinStrategy const& join_strategy
#ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER
, Mapper& mapper
Modified: sandbox/geometry/boost/geometry/algorithms/detail/buffer/remove_within_distance.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/buffer/remove_within_distance.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/buffer/remove_within_distance.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -8,8 +8,11 @@
#ifndef BOOST_GEOMETRY_ALGORITHM_REMOVE_WITHIN_DISTANCE_HPP
#define BOOST_GEOMETRY_ALGORITHM_REMOVE_WITHIN_DISTANCE_HPP
+
#include <algorithm>
+#include <boost/range.hpp>
+
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/algorithms/detail/point_on_border.hpp>
@@ -100,8 +103,8 @@
template<typename Collection, typename Geometry, typename T>
-inline void collection_remove_within_distance(Collection& dissolved,
- Geometry const& input,
+inline void collection_remove_within_distance(Collection& dissolved,
+ Geometry const& input,
T const& distance)
{
typedef typename boost::range_value<Collection>::type polygon_type;
Modified: sandbox/geometry/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -15,8 +15,7 @@
#include <boost/foreach.hpp>
#include <boost/numeric/conversion/cast.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/ring_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/calculate_sum.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/calculate_sum.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/calculate_sum.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -8,6 +8,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_CALCULATE_SUM_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_CALCULATE_SUM_HPP
+
+#include <boost/range.hpp>
+
namespace boost { namespace geometry
{
Modified: sandbox/geometry/boost/geometry/algorithms/detail/disjoint.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/disjoint.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/disjoint.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -15,6 +15,8 @@
#include <cstddef>
+#include <boost/range.hpp>
+
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>
#include <boost/geometry/core/is_multi.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/equals/collect_vectors.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/equals/collect_vectors.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,9 +13,6 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/range.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
-
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/dissolver.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/dissolver.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/dissolver.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,6 +12,8 @@
#include <deque>
#include <vector>
+#include <boost/range.hpp>
+
#include <boost/geometry/core/tag.hpp>
#include <boost/geometry/core/tags.hpp>
#include <boost/geometry/core/point_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/split_rings.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/split_rings.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/split_rings.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,6 +13,8 @@
//#include <boost/foreach.hpp>
#include <deque>
+#include <boost/range.hpp>
+
#include <boost/geometry/algorithms/overlay/get_turns.hpp>
#include <boost/geometry/core/point_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/point_on_border.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/point_on_border.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/point_on_border.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,7 +11,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/ring_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/sections/get_full_section.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/sections/get_full_section.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/sections/get_full_section.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,9 +9,7 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_GET_FULL_SECTION_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
-
+#include <boost/range.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/exterior_ring.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,9 +10,7 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_GET_SECTION_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
-
+#include <boost/range.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/exterior_ring.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/sections/sectionalize.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/sections/sectionalize.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/sections/sectionalize.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -14,8 +14,7 @@
#include <boost/concept_check.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/algorithms/combine.hpp>
@@ -62,7 +61,7 @@
typedef Box box_type;
// unique ID used in get_turns to mark section-pairs already handled.
- int id;
+ int id;
int directions[DimensionCount];
int ring_index;
@@ -493,7 +492,7 @@
template <typename Sections>
inline void set_section_unique_ids(Sections& sections)
{
- // Set ID's.
+ // Set ID's.
int index = 0;
for (typename boost::range_iterator<Sections>::type it = boost::begin(sections);
it != boost::end(sections);
Modified: sandbox/geometry/boost/geometry/algorithms/disjoint.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/disjoint.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/disjoint.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -31,8 +31,8 @@
#include <boost/mpl/if.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/static_assert.hpp>
#include <boost/geometry/core/access.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/dissolve.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/dissolve.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/dissolve.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,6 +12,8 @@
#include <map>
#include <vector>
+#include <boost/range.hpp>
+
#include <boost/geometry/algorithms/overlay/get_turns.hpp>
#include <boost/geometry/algorithms/overlay/self_turn_points.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/distance.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/distance.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/distance.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,8 +10,8 @@
#define BOOST_GEOMETRY_ALGORITHMS_DISTANCE_HPP
#include <boost/mpl/if.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/static_assert.hpp>
#include <boost/geometry/core/cs.hpp>
@@ -148,7 +148,7 @@
{
typedef std::pair<typename PPStrategy::return_type, bool> distance_containment;
- static inline distance_containment apply(Point const& point,
+ static inline distance_containment apply(Point const& point,
Ring const& ring,
PPStrategy const& pp_strategy, PSStrategy const& ps_strategy)
{
@@ -160,7 +160,7 @@
Ring,
PPStrategy,
PSStrategy
- >::apply(point, ring, pp_strategy, ps_strategy),
+ >::apply(point, ring, pp_strategy, ps_strategy),
geometry::within(point, ring)
);
}
@@ -174,7 +174,7 @@
typedef typename PPStrategy::return_type return_type;
typedef std::pair<typename PPStrategy::return_type, bool> distance_containment;
- static inline distance_containment apply(Point const& point,
+ static inline distance_containment apply(Point const& point,
Polygon const& polygon,
PPStrategy const& pp_strategy, PSStrategy const& ps_strategy)
{
@@ -187,7 +187,7 @@
PSStrategy
> per_ring;
- distance_containment dc = per_ring::apply(point,
+ distance_containment dc = per_ring::apply(point,
exterior_ring(polygon), pp_strategy, ps_strategy);
for (typename boost::range_const_iterator
@@ -197,7 +197,7 @@
it != boost::end(interior_rings(polygon));
++it)
{
- distance_containment dcr = per_ring::apply(point,
+ distance_containment dcr = per_ring::apply(point,
*it, pp_strategy, ps_strategy);
if (dcr.first < dc.first)
{
Modified: sandbox/geometry/boost/geometry/algorithms/envelope.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/envelope.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/envelope.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,8 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_ENVELOPE_HPP
#define BOOST_GEOMETRY_ALGORITHMS_ENVELOPE_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/numeric/conversion/cast.hpp>
#include <boost/geometry/algorithms/combine.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/equals.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/equals.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/equals.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -33,8 +33,7 @@
#include <boost/mpl/if.hpp>
#include <boost/static_assert.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/for_each.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/for_each.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/for_each.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -19,6 +19,7 @@
#include <algorithm>
+#include <boost/range.hpp>
#include <boost/geometry/core/exterior_ring.hpp>
#include <boost/geometry/core/interior_rings.hpp>
@@ -36,7 +37,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace for_each {
+namespace detail { namespace for_each
+{
template <typename Point, typename Functor, bool IsConst>
Modified: sandbox/geometry/boost/geometry/algorithms/intersection.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/intersection.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/intersection.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,9 @@
#include <cstddef>
-
#include <boost/mpl/if.hpp>
+#include <boost/range/metafunctions.hpp>
+
#include <boost/geometry/core/reverse_dispatch.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/length.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/length.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/length.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,8 +11,7 @@
#include <iterator>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/mpl/if.hpp>
#include <boost/type_traits.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/num_points.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/num_points.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/num_points.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -24,7 +24,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace num_points {
+namespace detail { namespace num_points
+{
template <typename Range>
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,6 +13,9 @@
#include <map>
#include <vector>
+#include <boost/range.hpp>
+
+
#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
#include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
#include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/clip_linestring.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/clip_linestring.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/clip_linestring.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_CLIP_LINESTRING_HPP
#define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_CLIP_LINESTRING_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/append.hpp>
#include <boost/geometry/algorithms/clear.hpp>
@@ -21,7 +20,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace intersection {
+namespace strategy { namespace intersection
+{
/*!
\brief Strategy: line clipping algorithm after Liang Barsky
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/copy_segment_point.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/copy_segment_point.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/copy_segment_point.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,6 +10,8 @@
#define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_COPY_SEGMENT_POINT_HPP
+#include <boost/range.hpp>
+
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/core/exterior_ring.hpp>
#include <boost/geometry/core/interior_rings.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/copy_segments.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/copy_segments.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/copy_segments.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,6 +13,7 @@
#include <vector>
#include <boost/assert.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/enrich_intersection_points.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/enrich_intersection_points.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/enrich_intersection_points.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -20,8 +20,8 @@
//#endif
#include <boost/assert.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/geometry/algorithms/detail/ring_identifier.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/get_turns.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/get_turns.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/get_turns.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,8 +13,8 @@
#include <map>
#include <boost/mpl/if.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/tuple/tuple.hpp>
#include <boost/type_traits/remove_const.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/self_turn_points.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/self_turn_points.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/self_turn_points.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,8 +10,8 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/type_traits/remove_const.hpp>
#include <boost/geometry/core/access.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/overlay/traverse.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/traverse.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/traverse.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,8 +11,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/reverse.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/reverse.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/reverse.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,8 +11,6 @@
#include <algorithm>
#include <boost/range.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/simplify.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/simplify.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/simplify.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,9 +12,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
-
+#include <boost/range.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/core/ring_type.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/transform.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/transform.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/transform.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <cmath>
#include <iterator>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/clear.hpp>
#include <boost/geometry/algorithms/assign.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/union.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/union.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/union.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,6 +12,8 @@
#include <boost/mpl/if.hpp>
+#include <boost/range/metafunctions.hpp>
+
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/core/reverse_dispatch.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
@@ -193,7 +195,7 @@
\ingroup union
\tparam Geometry1 first geometry type
\tparam Geometry2 second geometry type
- \tparam Collection output collection, either a multi-geometry,
+ \tparam Collection output collection, either a multi-geometry,
or a std::vector<Geometry> / std::deque<Geometry> etc
\param geometry1 first geometry
\param geometry2 second geometry
Modified: sandbox/geometry/boost/geometry/algorithms/unique.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/unique.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/unique.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,8 +11,6 @@
#include <algorithm>
#include <boost/range.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
Modified: sandbox/geometry/boost/geometry/algorithms/within.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/within.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/within.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -46,8 +46,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/make.hpp>
Modified: sandbox/geometry/boost/geometry/core/interior_rings.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/interior_rings.hpp (original)
+++ sandbox/geometry/boost/geometry/core/interior_rings.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,7 +12,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
+#include <boost/range.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/geometry/core/tag.hpp>
Modified: sandbox/geometry/boost/geometry/core/point_order.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/point_order.hpp (original)
+++ sandbox/geometry/boost/geometry/core/point_order.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -8,20 +8,22 @@
#ifndef BOOST_GEOMETRY_CORE_POINT_ORDER_HPP
#define BOOST_GEOMETRY_CORE_POINT_ORDER_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+
+#include <boost/range.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/core/tag.hpp>
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
enum order_selector { clockwise = 1, counterclockwise = 2, order_undetermined = 0 };
-namespace traits {
+namespace traits
+{
/*!
\brief Traits class indicating the order of contained points within a
Modified: sandbox/geometry/boost/geometry/core/point_type.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/point_type.hpp (original)
+++ sandbox/geometry/boost/geometry/core/point_type.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,18 +9,18 @@
#ifndef BOOST_GEOMETRY_CORE_POINT_TYPE_HPP
#define BOOST_GEOMETRY_CORE_POINT_TYPE_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+
+#include <boost/range.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/core/tag.hpp>
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry
+namespace boost { namespace geometry
{
-namespace traits
+namespace traits
{
/*!
@@ -104,7 +104,7 @@
typedef typename boost::remove_const<Geometry>::type ncg;
typedef typename core_dispatch::point_type
<
- typename tag<Geometry>::type,
+ typename tag<Geometry>::type,
ncg
>::type type;
};
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/connect.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/connect.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/connect.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,9 +11,7 @@
#include <map>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
-
+#include <boost/range.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/algorithms/distance.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/midpoints.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/midpoints.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/midpoints.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -14,8 +14,7 @@
#include <cstddef>
#include <iterator>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/remove_spikes.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/remove_spikes.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/remove_spikes.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,6 @@
#include <deque>
#include <boost/range.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/selected.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/selected.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/selected.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <cmath>
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/strategies/strategies.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,8 @@
#include <string>
#include <boost/concept/assert.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/geometry/core/exterior_ring.hpp>
#include <boost/geometry/core/interior_rings.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -15,8 +15,8 @@
#include <boost/algorithm/string.hpp>
#include <boost/mpl/if.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/type_traits.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,8 @@
#include <string>
#include <boost/concept/assert.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/geometry/algorithms/convert.hpp>
#include <boost/geometry/core/exterior_ring.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_init.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_init.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_init.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -39,7 +39,7 @@
#include <vector>
#include <boost/algorithm/string.hpp>
-#include <boost/range/functions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_datum_set.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_datums.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/io/svg/write_svg.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/io/svg/write_svg.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/io/svg/write_svg.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,8 +13,8 @@
#include <string>
#include <boost/config.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/geometry/core/exterior_ring.hpp>
#include <boost/geometry/core/interior_rings.hpp>
Modified: sandbox/geometry/boost/geometry/geometries/concepts/linestring_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/linestring_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/linestring_concept.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -24,7 +24,8 @@
#include <boost/geometry/geometries/concepts/detail/check_append.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
@@ -44,7 +45,7 @@
to add a point to a linestring
\note to fulfil the concepts, no traits class has to be specialized to
-define the point type. The point type is taken using boost::range_value<X>::type
+define the point type.
\par Example:
Modified: sandbox/geometry/boost/geometry/geometries/concepts/ring_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/ring_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/ring_concept.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -41,7 +41,7 @@
This is the same as the for the concept Linestring, and described there.
\note to fulfil the concepts, no traits class has to be specialized to
-define the point type. The point type is taken using boost::range_value<X>::type
+define the point type.
*/
template <typename Geometry>
class Ring
Modified: sandbox/geometry/boost/geometry/geometries/linestring.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/linestring.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/linestring.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,7 +13,7 @@
#include <vector>
#include <boost/concept/assert.hpp>
-#include <boost/range/functions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/tag.hpp>
#include <boost/geometry/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/iterators/section_iterators.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/iterators/section_iterators.hpp (original)
+++ sandbox/geometry/boost/geometry/iterators/section_iterators.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,6 +11,8 @@
#include <iterator>
+#include <boost/range.hpp>
+
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/iterators/base.hpp>
#include <boost/geometry/algorithms/overlaps.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/area.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/area.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/area.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,11 +9,16 @@
#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_AREA_HPP
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_AREA_HPP
+
+#include <boost/range/metafunctions.hpp>
+
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/multi/core/point_type.hpp>
#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
-namespace boost { namespace geometry {
+
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
Modified: sandbox/geometry/boost/geometry/multi/algorithms/centroid.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/centroid.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/centroid.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_CENTROID_HPP
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_CENTROID_HPP
+
+#include <boost/range.hpp>
+
#include <boost/geometry/algorithms/centroid.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/multi/core/point_type.hpp>
@@ -16,11 +19,13 @@
#include <boost/geometry/multi/algorithms/num_points.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace centroid {
+namespace detail { namespace centroid
+{
/*!
Modified: sandbox/geometry/boost/geometry/multi/algorithms/detail/modify.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/modify.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/detail/modify.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
namespace boost { namespace geometry
Modified: sandbox/geometry/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,11 +10,11 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_WITH_PREDICATE_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
Modified: sandbox/geometry/boost/geometry/multi/algorithms/detail/multi_sum.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/multi_sum.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/detail/multi_sum.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,8 @@
#ifndef BOOST_GEOMETRY_MULTI_SUM_HPP
#define BOOST_GEOMETRY_MULTI_SUM_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
namespace boost { namespace geometry
{
Modified: sandbox/geometry/boost/geometry/multi/algorithms/detail/point_on_border.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/point_on_border.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/detail/point_on_border.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -8,8 +8,7 @@
#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/algorithms/detail/point_on_border.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_full_section.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_full_section.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_full_section.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,15 +10,12 @@
#include <boost/assert.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/algorithms/detail/sections/get_full_section.hpp>
-
-
namespace boost { namespace geometry
{
Modified: sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_section.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_section.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/get_section.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <boost/assert.hpp>
#include <boost/concept/requires.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,8 +13,7 @@
#include <vector>
#include <boost/concept/requires.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/dissolve.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/dissolve.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/dissolve.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,6 +11,8 @@
#include <vector>
+#include <boost/range.hpp>
+
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/core/point_type.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/distance.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/distance.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/distance.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,8 +11,7 @@
#include <boost/numeric/conversion/bounds.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/core/is_multi.hpp>
@@ -23,11 +22,11 @@
#include <boost/geometry/util/select_coordinate_type.hpp>
-namespace boost { namespace geometry
+namespace boost { namespace geometry
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace distance
+namespace detail { namespace distance
{
Modified: sandbox/geometry/boost/geometry/multi/algorithms/envelope.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/envelope.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/envelope.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,6 +11,9 @@
#include <vector>
+#include <boost/range/metafunctions.hpp>
+
+
#include <boost/geometry/core/exterior_ring.hpp>
#include <boost/geometry/algorithms/envelope.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/for_each.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/for_each.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/for_each.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,6 +9,8 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_FOR_EACH_HPP
+#include <boost/range.hpp>
+
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/core/is_multi.hpp>
#include <boost/geometry/multi/core/point_type.hpp>
@@ -23,7 +25,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace for_each {
+namespace detail { namespace for_each
+{
// Implementation of multi, for both point and segment,
// just calling the single version.
Modified: sandbox/geometry/boost/geometry/multi/algorithms/length.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/length.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/length.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -8,10 +8,14 @@
#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_LENGTH_HPP
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_LENGTH_HPP
+
+#include <boost/range/metafunctions.hpp>
+
#include <boost/geometry/algorithms/length.hpp>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
+
namespace boost { namespace geometry
{
Modified: sandbox/geometry/boost/geometry/multi/algorithms/num_points.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/num_points.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/num_points.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,6 +11,8 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_POINTS_HPP
+#include <boost/range.hpp>
+
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/overlay/assemble.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/overlay/assemble.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/overlay/assemble.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,8 +10,7 @@
#include <boost/assert.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/overlay/assemble.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segment_point.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segment_point.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segment_point.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_OVERLAY_COPY_SEGMENT_POINT_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/algorithms/overlay/copy_segment_point.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segments.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segments.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segments.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,8 +11,7 @@
#include <boost/assert.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/overlay/copy_segments.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/perimeter.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/perimeter.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/perimeter.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_PERIMETER_HPP
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_PERIMETER_HPP
+
+#include <boost/range/metafunctions.hpp>
+
#include <boost/geometry/algorithms/perimeter.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/reverse.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/reverse.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/reverse.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -11,7 +11,6 @@
#include <boost/range/metafunctions.hpp>
-
#include <boost/geometry/algorithms/reverse.hpp>
#include <boost/geometry/multi/algorithms/detail/modify.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/simplify.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/simplify.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/simplify.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/core/is_multi.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/transform.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/transform.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/transform.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_TRANSFORM_HPP
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_TRANSFORM_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/transform.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/unique.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/unique.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/unique.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_UNIQUE_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/multi/algorithms/within.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/algorithms/within.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/algorithms/within.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,8 +10,7 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/within.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/multi/core/interior_rings.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/core/interior_rings.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/core/interior_rings.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,7 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/multi/core/num_geometries.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/core/num_geometries.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/core/num_geometries.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -12,8 +12,8 @@
#include <cstddef>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
+
#include <boost/geometry/core/num_geometries.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/multi/core/point_type.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/core/point_type.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/core/point_type.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,7 +13,6 @@
#include <boost/range/metafunctions.hpp>
-
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/multi/core/tags.hpp>
Modified: sandbox/geometry/boost/geometry/multi/core/ring_type.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/core/ring_type.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/core/ring_type.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -17,7 +17,6 @@
#include <boost/geometry/multi/core/tags.hpp>
-
namespace boost { namespace geometry
{
Modified: sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -15,7 +15,6 @@
#include <boost/range/concepts.hpp>
#include <boost/range/metafunctions.hpp>
-
#include <boost/geometry/geometries/concepts/polygon_concept.hpp>
Modified: sandbox/geometry/boost/geometry/multi/iterators/range_type.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/iterators/range_type.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/iterators/range_type.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#define BOOST_GEOMETRY_MULTI_ITERATORS_RANGE_TYPE_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/multi/core/is_multi.hpp>
Modified: sandbox/geometry/boost/geometry/multi/util/for_each_range.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/util/for_each_range.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/util/for_each_range.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,6 +10,8 @@
#define BOOST_GEOMETRY_MULTI_UTIL_FOR_EACH_RANGE_HPP
+#include <boost/range.hpp>
+
#include <boost/geometry/util/for_each_range.hpp>
#include <boost/geometry/util/range_iterator_const_if_c.hpp>
@@ -21,7 +23,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace for_each {
+namespace detail { namespace for_each
+{
template <typename Multi, typename Actor, bool IsConst>
Modified: sandbox/geometry/boost/geometry/multi/util/write_dsv.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/util/write_dsv.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/util/write_dsv.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,7 @@
#ifndef BOOST_GEOMETRY_MULTI_UTIL_WRITE_DSV_HPP
#define BOOST_GEOMETRY_MULTI_UTIL_WRITE_DSV_HPP
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/util/write_dsv.hpp>
Modified: sandbox/geometry/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,8 +13,7 @@
#include <algorithm>
#include <vector>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/core/point_type.hpp>
Modified: sandbox/geometry/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -13,7 +13,7 @@
#include <cstddef>
#include <vector>
-#include <boost/range/functions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/strategies/distance_result.hpp>
Modified: sandbox/geometry/boost/geometry/util/range_iterator_const_if_c.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/range_iterator_const_if_c.hpp (original)
+++ sandbox/geometry/boost/geometry/util/range_iterator_const_if_c.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -10,8 +10,7 @@
#include <boost/mpl/if.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
namespace boost { namespace geometry
Modified: sandbox/geometry/boost/geometry/util/reversible_view.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/reversible_view.hpp (original)
+++ sandbox/geometry/boost/geometry/util/reversible_view.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -8,8 +8,8 @@
#ifndef BOOST_GEOMETRY_UTIL_REVERSIBLE_VIEW_HPP
#define BOOST_GEOMETRY_UTIL_REVERSIBLE_VIEW_HPP
-#include <boost/type_traits.hpp>
-#include <boost/type_traits/remove_const.hpp>
+
+#include <boost/range.hpp>
#include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/core/tag.hpp>
Modified: sandbox/geometry/boost/geometry/util/write_dsv.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/write_dsv.hpp (original)
+++ sandbox/geometry/boost/geometry/util/write_dsv.hpp 2010-04-23 13:47:33 EDT (Fri, 23 Apr 2010)
@@ -14,8 +14,7 @@
#include <string>
#include <boost/concept_check.hpp>
-#include <boost/range/functions.hpp>
-#include <boost/range/metafunctions.hpp>
+#include <boost/range.hpp>
#include <boost/geometry/algorithms/convert.hpp>