|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r61527 - in sandbox/geometry/boost/geometry: algorithms algorithms/detail/sections algorithms/overlay core extensions/algorithms extensions/gis/geographic/strategies extensions/gis/io/wkt extensions/gis/latlong/detail extensions/gis/projections extensions/gis/projections/impl extensions/index/rtree extensions/io/svg extensions/nsphere/algorithms extensions/nsphere/core geometries geometries/adapted iterators policies/relate strategies strategies/agnostic util
From: barend.gehrels_at_[hidden]
Date: 2010-04-24 08:10:00
Author: barendgehrels
Date: 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
New Revision: 61527
URL: http://svn.boost.org/trac/boost/changeset/61527
Log:
Stylistic changes, harmonizing const T& -> T const&
Text files modified:
sandbox/geometry/boost/geometry/algorithms/area.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/assign.hpp | 6 ++--
sandbox/geometry/boost/geometry/algorithms/buffer.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/centroid.hpp | 8 +++---
sandbox/geometry/boost/geometry/algorithms/combine.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/convert.hpp | 2
sandbox/geometry/boost/geometry/algorithms/convex_hull.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/correct.hpp | 2
sandbox/geometry/boost/geometry/algorithms/detail/sections/get_full_section.hpp | 2
sandbox/geometry/boost/geometry/algorithms/detail/sections/get_section.hpp | 2
sandbox/geometry/boost/geometry/algorithms/detail/sections/sectionalize.hpp | 39 ++++++++++++-------------------------
sandbox/geometry/boost/geometry/algorithms/disjoint.hpp | 41 ++++++++++++++++++---------------------
sandbox/geometry/boost/geometry/algorithms/distance.hpp | 7 ++---
sandbox/geometry/boost/geometry/algorithms/envelope.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/for_each.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/intersects.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/length.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/overlaps.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/overlay/copy_segment_point.hpp | 10 ++++----
sandbox/geometry/boost/geometry/algorithms/overlay/copy_segments.hpp | 2
sandbox/geometry/boost/geometry/algorithms/overlay/get_turns.hpp | 10 ++++----
sandbox/geometry/boost/geometry/algorithms/perimeter.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/simplify.hpp | 4 +-
sandbox/geometry/boost/geometry/algorithms/transform.hpp | 6 ++--
sandbox/geometry/boost/geometry/algorithms/union.hpp | 8 +++---
sandbox/geometry/boost/geometry/algorithms/within.hpp | 8 +++---
sandbox/geometry/boost/geometry/core/access.hpp | 8 +++---
sandbox/geometry/boost/geometry/core/exterior_ring.hpp | 2
sandbox/geometry/boost/geometry/core/interior_rings.hpp | 2
sandbox/geometry/boost/geometry/core/radian_access.hpp | 2
sandbox/geometry/boost/geometry/extensions/algorithms/midpoints.hpp | 2
sandbox/geometry/boost/geometry/extensions/algorithms/point_on_line.hpp | 2
sandbox/geometry/boost/geometry/extensions/algorithms/remove_spikes.hpp | 27 ++++++++++++++-----------
sandbox/geometry/boost/geometry/extensions/algorithms/selected.hpp | 6 ++--
sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp | 4 +-
sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp | 2
sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp | 4 +-
sandbox/geometry/boost/geometry/extensions/gis/latlong/detail/graticule.hpp | 10 ++++----
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp | 10 ++++----
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_static.hpp | 8 +++---
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp | 4 +-
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp | 2
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp | 4 +-
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_init.hpp | 12 +++++++---
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp | 8 ++++--
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_param.hpp | 4 +-
sandbox/geometry/boost/geometry/extensions/gis/projections/projection.hpp | 4 +-
sandbox/geometry/boost/geometry/extensions/index/rtree/rtree.hpp | 7 +++--
sandbox/geometry/boost/geometry/extensions/index/rtree/rtree_leaf.hpp | 7 +++--
sandbox/geometry/boost/geometry/extensions/io/svg/write_svg.hpp | 4 +-
sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/envelope.hpp | 20 ++++++++++++++++--
sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/within.hpp | 24 ++++++++++++----------
sandbox/geometry/boost/geometry/extensions/nsphere/core/radius.hpp | 22 +++++++++++---------
sandbox/geometry/boost/geometry/geometries/adapted/c_array.hpp | 2
sandbox/geometry/boost/geometry/geometries/segment.hpp | 2
sandbox/geometry/boost/geometry/iterators/base.hpp | 4 +-
sandbox/geometry/boost/geometry/iterators/section_iterators.hpp | 20 +++++++++---------
sandbox/geometry/boost/geometry/policies/relate/de9im.hpp | 2
sandbox/geometry/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp | 2
sandbox/geometry/boost/geometry/strategies/intersection.hpp | 4 +-
sandbox/geometry/boost/geometry/util/reversible_view.hpp | 2
sandbox/geometry/boost/geometry/util/write_dsv.hpp | 2
62 files changed, 230 insertions(+), 218 deletions(-)
Modified: sandbox/geometry/boost/geometry/algorithms/area.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/area.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/area.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -224,7 +224,7 @@
template <typename Geometry>
inline typename area_result<Geometry>::type area(Geometry const& geometry)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
typedef typename area_result<Geometry>::strategy_type strategy_type;
@@ -250,7 +250,7 @@
inline typename Strategy::return_type area(
Geometry const& geometry, Strategy const& strategy)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return dispatch::area
<
Modified: sandbox/geometry/boost/geometry/algorithms/assign.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/assign.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/assign.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -475,7 +475,7 @@
Point& lower_left, Point& lower_right,
Point& upper_left, Point& upper_right)
{
- concept::check<const Box>();
+ concept::check<Box const>();
concept::check<Point>();
detail::assign::assign_box_2d_corner
@@ -499,7 +499,7 @@
template <std::size_t Index, typename Geometry, typename Point>
inline void assign_point_to_index(Point const& point, Geometry& geometry)
{
- concept::check<const Point>();
+ concept::check<Point const>();
concept::check<Geometry>();
detail::assign::assign_point_to_index
@@ -518,7 +518,7 @@
template <std::size_t Index, typename Point, typename Geometry>
inline void assign_point_from_index(Geometry const& geometry, Point& point)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
concept::check<Point>();
detail::assign::assign_point_from_index
Modified: sandbox/geometry/boost/geometry/algorithms/buffer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/buffer.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/buffer.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -117,7 +117,7 @@
inline void buffer(Input const& geometry_in, Output& geometry_out,
T const& distance, T const& chord_length = -1)
{
- concept::check<const Input>();
+ concept::check<Input const>();
concept::check<Output>();
dispatch::buffer
@@ -142,7 +142,7 @@
template <typename Output, typename Input, typename T>
Output make_buffer(Input const& geometry, T const& distance, T const& chord_length = -1)
{
- concept::check<const Input>();
+ concept::check<Input const>();
concept::check<Output>();
Output geometry_out;
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -394,7 +394,7 @@
{
//BOOST_CONCEPT_ASSERT( (geometry::concept::CentroidStrategy<Strategy>) );
- concept::check_concepts_and_equal_dimensions<Point, const Geometry>();
+ concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
typedef typename point_type<Geometry>::type point_type;
@@ -419,7 +419,7 @@
template<typename Geometry, typename Point>
inline void centroid(Geometry const& geometry, Point& c)
{
- concept::check_concepts_and_equal_dimensions<Point, const Geometry>();
+ concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
typedef typename strategy_centroid
<
@@ -443,7 +443,7 @@
template<typename Point, typename Geometry>
inline Point make_centroid(Geometry const& geometry)
{
- concept::check_concepts_and_equal_dimensions<Point, const Geometry>();
+ concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
Point c;
centroid(geometry, c);
@@ -462,7 +462,7 @@
{
//BOOST_CONCEPT_ASSERT( (geometry::concept::CentroidStrategy<Strategy>) );
- concept::check_concepts_and_equal_dimensions<Point, const Geometry>();
+ concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
Point c;
centroid(geometry, c, strategy);
Modified: sandbox/geometry/boost/geometry/algorithms/combine.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/combine.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/combine.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -283,7 +283,7 @@
StrategyLess const& strategy_less,
StrategyGreater const& strategy_greater)
{
- concept::check_concepts_and_equal_dimensions<Box, const Geometry>();
+ concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
dispatch::combine
<
@@ -307,7 +307,7 @@
template <typename Box, typename Geometry>
inline void combine(Box& box, Geometry const& geometry)
{
- concept::check_concepts_and_equal_dimensions<Box, const Geometry>();
+ concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
dispatch::combine
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -256,7 +256,7 @@
template <typename Geometry1, typename Geometry2>
inline void convert(Geometry1 const& geometry1, Geometry2& geometry2)
{
- concept::check_concepts_and_equal_dimensions<const Geometry1, Geometry2>();
+ concept::check_concepts_and_equal_dimensions<Geometry1 const, Geometry2>();
dispatch::convert
<
Modified: sandbox/geometry/boost/geometry/algorithms/convex_hull.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/convex_hull.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/convex_hull.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -225,7 +225,7 @@
OutputIterator out, Strategy const& strategy)
{
// Concept: output point type = point type of input geometry
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
concept::check<typename point_type<Geometry>::type>();
BOOST_CONCEPT_ASSERT( (geometry::concept::ConvexHullStrategy<Strategy>) );
@@ -258,7 +258,7 @@
OutputIterator out)
{
// Concept: output point type = point type of input geometry
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
concept::check<typename point_type<Geometry>::type>();
typedef typename range_type<Geometry>::type range_type;
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -185,7 +185,7 @@
template <typename Geometry>
inline void correct(Geometry& geometry)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
dispatch::correct<typename tag<Geometry>::type, Geometry>::apply(geometry);
}
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -123,7 +123,7 @@
typename geometry::range_type<Geometry>::type const
>::type& end)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
typedef typename boost::range_iterator
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -96,7 +96,7 @@
typename geometry::range_type<Geometry>::type
>::type& end)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
dispatch::get_section
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -12,8 +12,6 @@
#include <cstddef>
#include <vector>
-#include <boost/concept_check.hpp>
-
#include <boost/range.hpp>
#include <boost/geometry/algorithms/assign.hpp>
@@ -105,7 +103,7 @@
struct sections : std::vector<section<Box, DimensionCount> >
{
typedef Box box_type;
- static const std::size_t value = DimensionCount;
+ static std::size_t const value = DimensionCount;
};
@@ -137,18 +135,14 @@
template <typename Segment, std::size_t DimensionCount>
struct get_direction_loop<Segment, DimensionCount, DimensionCount>
{
- static inline void apply(Segment const& seg,
- int directions[DimensionCount])
- {
- boost::ignore_unused_variable_warning(seg);
- boost::ignore_unused_variable_warning(directions);
- }
+ static inline void apply(Segment const&, int [DimensionCount])
+ {}
};
template <typename T, std::size_t Dimension, std::size_t DimensionCount>
struct copy_loop
{
- static inline void apply(const T source[DimensionCount],
+ static inline void apply(T const source[DimensionCount],
T target[DimensionCount])
{
target[Dimension] = source[Dimension];
@@ -159,19 +153,15 @@
template <typename T, std::size_t DimensionCount>
struct copy_loop<T, DimensionCount, DimensionCount>
{
- static inline void apply(const T source[DimensionCount],
- T target[DimensionCount])
- {
- boost::ignore_unused_variable_warning(source);
- boost::ignore_unused_variable_warning(target);
- }
+ static inline void apply(T const [DimensionCount], T [DimensionCount])
+ {}
};
template <typename T, std::size_t Dimension, std::size_t DimensionCount>
struct compare_loop
{
- static inline bool apply(const T source[DimensionCount],
- const T target[DimensionCount])
+ static inline bool apply(T const source[DimensionCount],
+ T const target[DimensionCount])
{
bool const not_equal = target[Dimension] != source[Dimension];
@@ -187,11 +177,9 @@
template <typename T, std::size_t DimensionCount>
struct compare_loop<T, DimensionCount, DimensionCount>
{
- static inline bool apply(const T source[DimensionCount],
- const T target[DimensionCount])
+ static inline bool apply(T const [DimensionCount],
+ T const [DimensionCount])
{
- boost::ignore_unused_variable_warning(source);
- boost::ignore_unused_variable_warning(target);
return true;
}
@@ -242,9 +230,8 @@
template <typename T, std::size_t DimensionCount>
struct assign_loop<T, DimensionCount, DimensionCount>
{
- static inline void apply(T dims[DimensionCount], int const)
+ static inline void apply(T [DimensionCount], int const)
{
- boost::ignore_unused_variable_warning(dims);
}
};
@@ -375,7 +362,7 @@
static inline void apply(Range const& range, Sections& sections,
int ring_index = -1, int multi_index = -1)
{
- typedef segment<const Point> segment_type;
+ typedef segment<Point const> segment_type;
std::size_t const n = boost::size(range);
if (n == 0)
@@ -615,7 +602,7 @@
concept::check<Geometry const>();
// A maximum of 10 segments per section seems to give the fastest results
- static const std::size_t max_segments_per_section = 10;
+ static std::size_t const max_segments_per_section = 10;
typedef dispatch::sectionalize
<
typename tag<Geometry>::type,
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -50,7 +50,6 @@
#include <boost/geometry/util/math.hpp>
-
namespace boost { namespace geometry
{
@@ -178,40 +177,37 @@
\return true if disjoint, else false
*/
template <typename Geometry1, typename Geometry2>
-inline bool disjoint(const Geometry1& geometry1,
- const Geometry2& geometry2)
+inline bool disjoint(Geometry1 const& geometry1,
+ Geometry2 const& geometry2)
{
concept::check_concepts_and_equal_dimensions
<
- const Geometry1,
- const Geometry2
+ Geometry1 const,
+ Geometry2 const
>();
- typedef typename boost::remove_const<Geometry1>::type ncg1_type;
- typedef typename boost::remove_const<Geometry2>::type ncg2_type;
-
return boost::mpl::if_c
<
reverse_dispatch<Geometry1, Geometry2>::type::value,
dispatch::disjoint_reversed
<
- typename tag<ncg1_type>::type,
- typename tag<ncg2_type>::type,
- ncg1_type,
- ncg2_type,
- is_multi<ncg1_type>::type::value,
- is_multi<ncg2_type>::type::value,
- dimension<ncg1_type>::type::value
+ typename tag<Geometry1>::type,
+ typename tag<Geometry2>::type,
+ Geometry1,
+ Geometry2,
+ is_multi<Geometry1>::type::value,
+ is_multi<Geometry2>::type::value,
+ dimension<Geometry1>::type::value
>,
dispatch::disjoint
<
- typename tag<ncg1_type>::type,
- typename tag<ncg2_type>::type,
- ncg1_type,
- ncg2_type,
- is_multi<ncg1_type>::type::value,
- is_multi<ncg2_type>::type::value,
- dimension<ncg1_type>::type::value
+ typename tag<Geometry1>::type,
+ typename tag<Geometry2>::type,
+ Geometry1,
+ Geometry2,
+ is_multi<Geometry1>::type::value,
+ is_multi<Geometry2>::type::value,
+ dimension<Geometry1>::type::value
>
>::type::apply(geometry1, geometry2);
}
@@ -219,4 +215,5 @@
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_ALGORITHMS_DISJOINT_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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -104,7 +104,7 @@
static inline return_type apply(Point const& point, Range const& range,
PPStrategy const& pp_strategy, PSStrategy const& ps_strategy)
{
- typedef segment<const typename point_type<Range>::type> segment_type;
+ typedef segment<typename point_type<Range>::type const> segment_type;
if (boost::size(range) == 0)
{
@@ -261,7 +261,6 @@
Linestring const& linestring,
Strategy const& strategy)
{
- //typedef segment<const > segment_type;
typedef typename geometry::strategy_distance_segment
<
typename cs_tag<Point>::type,
@@ -466,8 +465,8 @@
inline typename distance_result<Geometry1, Geometry2>::type distance(
Geometry1 const& geometry1, Geometry2 const& geometry2)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
typedef typename point_type<Geometry1>::type point1_type;
typedef typename point_type<Geometry2>::type point2_type;
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -245,7 +245,7 @@
template<typename Geometry, typename Box>
inline void envelope(Geometry const& geometry, Box& mbr)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
concept::check<Box>();
dispatch::envelope
@@ -265,7 +265,7 @@
template<typename Box, typename Geometry>
inline Box make_envelope(Geometry const& geometry)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
concept::check<Box>();
Box mbr;
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -270,7 +270,7 @@
template<typename Geometry, typename Functor>
inline Functor for_each_point(Geometry const& geometry, Functor f)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return dispatch::for_each_point
<
@@ -317,7 +317,7 @@
template<typename Geometry, typename Functor>
inline Functor for_each_segment(Geometry const& geometry, Functor f)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return dispatch::for_each_segment
<
Modified: sandbox/geometry/boost/geometry/algorithms/intersects.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/intersects.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/intersects.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -99,8 +99,8 @@
template <typename Geometry1, typename Geometry2>
inline bool intersects(Geometry1 const& geometry1, Geometry2 const& geometry2)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
return ! geometry::disjoint(geometry1, geometry2);
}
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -154,7 +154,7 @@
inline typename length_result<Geometry>::type length(
Geometry const& geometry)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
typedef typename point_type<Geometry>::type point_type;
typedef typename cs_tag<point_type>::type cs_tag;
@@ -196,7 +196,7 @@
inline typename length_result<Geometry>::type length(
Geometry const& geometry, Strategy const& strategy)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return dispatch::length
<
Modified: sandbox/geometry/boost/geometry/algorithms/overlaps.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlaps.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/overlaps.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -178,8 +178,8 @@
template <typename Geometry1, typename Geometry2>
inline bool overlaps(Geometry1 const& geometry1, Geometry2 const& geometry2)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
return dispatch::overlaps
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -188,7 +188,7 @@
SegmentIdentifier const& seg_id, bool second,
PointOut& point_out)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return dispatch::copy_segment_point
<
@@ -216,8 +216,8 @@
SegmentIdentifier const& seg_id, bool second,
PointOut& point_out)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
if (seg_id.source_index == 0)
{
@@ -260,8 +260,8 @@
SegmentIdentifier const& seg_id,
PointOut& point1, PointOut& point2)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
return copy_segment_point(geometry1, geometry2, seg_id, false, point1)
&& copy_segment_point(geometry1, geometry2, seg_id, true, point2);
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -209,7 +209,7 @@
SegmentIdentifier const& seg_id, int to_index,
RangeOut& range_out)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
dispatch::copy_segments
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -220,8 +220,8 @@
private :
typedef typename geometry::point_type<Geometry1>::type point1_type;
typedef typename geometry::point_type<Geometry2>::type point2_type;
- typedef typename geometry::segment<const point1_type> segment1_type;
- typedef typename geometry::segment<const point2_type> segment2_type;
+ typedef typename geometry::segment<point1_type const> segment1_type;
+ typedef typename geometry::segment<point2_type const> segment2_type;
template <size_t Dim, typename Point, typename Box>
@@ -306,7 +306,7 @@
template <typename Box, typename Sections>
static inline void add_sections(Box& box, Sections const& sections)
{
- for (typename boost::range_iterator<const Sections>::type
+ for (typename boost::range_iterator<Sections const>::type
it = sections.begin();
it != sections.end();
++it)
@@ -319,7 +319,7 @@
static inline void get_sections(Sections const& sections,
Box const& box, Sections& selection)
{
- for (typename boost::range_iterator<const Sections>::type
+ for (typename boost::range_iterator<Sections const>::type
it = sections.begin();
it != sections.end();
++it)
@@ -838,7 +838,7 @@
Turns& turns,
InterruptPolicy& interrupt_policy)
{
- concept::check_concepts_and_equal_dimensions<const Geometry1, const Geometry2>();
+ concept::check_concepts_and_equal_dimensions<Geometry1 const, Geometry2 const>();
typedef typename strategy_intersection
<
Modified: sandbox/geometry/boost/geometry/algorithms/perimeter.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/perimeter.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/perimeter.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -87,7 +87,7 @@
inline typename length_result<Geometry>::type perimeter(
Geometry const& geometry)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
typedef typename point_type<Geometry>::type point_type;
typedef typename cs_tag<point_type>::type cs_tag;
@@ -121,7 +121,7 @@
inline typename length_result<Geometry>::type perimeter(
Geometry const& geometry, Strategy const& strategy)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return dispatch::perimeter
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -358,7 +358,7 @@
inline void simplify_inserter(Geometry const& geometry, OutputIterator out,
double max_distance, Strategy const& strategy)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
BOOST_CONCEPT_ASSERT( (geometry::concept::SimplifyStrategy<Strategy>) );
dispatch::simplify_inserter
@@ -384,7 +384,7 @@
typedef typename point_type<Geometry>::type point_type;
// Concept: output point type = point type of input geometry
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
concept::check<point_type>();
typedef typename cs_tag<point_type>::type cs_tag;
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -151,7 +151,7 @@
template <typename Polygon1, typename Polygon2, typename Strategy>
struct transform_polygon
{
- static inline bool apply(const Polygon1& poly1, Polygon2& poly2,
+ static inline bool apply(Polygon1 const& poly1, Polygon2& poly2,
Strategy const& strategy)
{
typedef typename interior_type<Polygon1>::type interior1_type;
@@ -296,7 +296,7 @@
inline bool transform(Geometry1 const& geometry1, Geometry2& geometry2,
Strategy const& strategy)
{
- concept::check<const Geometry1>();
+ concept::check<Geometry1 const>();
concept::check<Geometry2>();
typedef dispatch::transform
@@ -323,7 +323,7 @@
template <typename Geometry1, typename Geometry2>
inline bool transform(Geometry1 const& geometry1, Geometry2& geometry2)
{
- concept::check<const Geometry1>();
+ concept::check<Geometry1 const>();
concept::check<Geometry2>();
typename detail::transform::select_strategy<Geometry1, Geometry2>::type strategy;
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -123,8 +123,8 @@
OutputIterator out,
Strategy const& strategy)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
return boost::mpl::if_c
<
@@ -175,8 +175,8 @@
Geometry2 const& geometry2,
OutputIterator out)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
typedef strategy_intersection
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -312,8 +312,8 @@
template<typename Geometry1, typename Geometry2>
inline bool within(Geometry1 const& geometry1, Geometry2 const& geometry2)
{
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
typedef typename point_type<Geometry1>::type point_type1;
typedef typename point_type<Geometry2>::type point_type2;
@@ -354,8 +354,8 @@
// Because for point-in-box, it makes no sense to specify one.
BOOST_CONCEPT_ASSERT( (geometry::concept::WithinStrategy<Strategy>) );
- concept::check<const Geometry1>();
- concept::check<const Geometry2>();
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
return dispatch::within
<
Modified: sandbox/geometry/boost/geometry/core/access.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/access.hpp (original)
+++ sandbox/geometry/boost/geometry/core/access.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -60,7 +60,7 @@
/// @par Geometries:
/// @li point
/// @par Specializations should provide, per Dimension
-/// @li static inline T get(const G&)
+/// @li static inline T get(G const&)
/// @li static inline void set(G&, T const&)
/// @tparam Geometry geometry-type
/// @tparam Dimension dimension to access
@@ -78,7 +78,7 @@
- box
- segment
\par Specializations should provide:
- - static inline T get(const G&)
+ - static inline T get(G const&)
- static inline void set(G&, T const&)
\ingroup traits
*/
@@ -156,7 +156,7 @@
>
struct access
{
- //static inline T get(const G& ) {}
+ //static inline T get(G const&) {}
//static inline void set(G& g, T const& value) {}
};
@@ -170,7 +170,7 @@
>
struct indexed_access
{
- //static inline T get(const G& ) {}
+ //static inline T get(G const&) {}
//static inline void set(G& g, T const& value) {}
};
Modified: sandbox/geometry/boost/geometry/core/exterior_ring.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/exterior_ring.hpp (original)
+++ sandbox/geometry/boost/geometry/core/exterior_ring.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -36,7 +36,7 @@
- polygon
\par Specializations should provide:
- static inline RING& get(POLY& )
- - static inline const RING& get(const POLY& )
+ - static inline RING const& get(POLY const& )
*/
template <typename Polygon>
struct exterior_ring
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -49,7 +49,7 @@
- polygon
\par Specializations should provide:
- static inline INTERIOR& get(POLY&)
- - static inline const INTERIOR& get(const POLY&)
+ - static inline const INTERIOR& get(POLY const&)
\tparam Geometry geometry
*/
template <typename Geometry>
Modified: sandbox/geometry/boost/geometry/core/radian_access.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/radian_access.hpp (original)
+++ sandbox/geometry/boost/geometry/core/radian_access.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -111,7 +111,7 @@
e.g. spherical or geographic coordinate systems
*/
template <std::size_t Dimension, typename Geometry>
-inline typename coordinate_type<Geometry>::type get_as_radian(const Geometry& geometry)
+inline typename coordinate_type<Geometry>::type get_as_radian(Geometry const& geometry)
{
return detail::radian_access<Dimension, Geometry,
typename coordinate_system<Geometry>::type>::get(geometry);
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -120,7 +120,7 @@
inline void midpoints(Geometry const& geometry,
bool start_and_end, Iterator out)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
dispatch::midpoints
<
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/point_on_line.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/point_on_line.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/point_on_line.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -29,7 +29,7 @@
// Date : spring 1996
//----------------------------------------------------------------------
template <typename P, typename L>
-bool point_on_linestring(const L& line, const double& position, P& point)
+bool point_on_linestring(L const& line, double const& position, P& point)
{
double current_distance = 0.0;
if (line.size() < 2)
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -16,6 +16,7 @@
#include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
@@ -300,22 +301,25 @@
template <typename Point>
-struct remove_by_normalized
+class remove_by_normalized
{
typedef typename coordinate_type<Point>::type coordinate_type;
coordinate_type m_zero;
+ coordinate_type m_limit;
- inline remove_by_normalized()
- : m_zero(coordinate_type())
+public :
+ inline remove_by_normalized(coordinate_type const& lm = 1.0e-7)
+ : m_zero(coordinate_type())
+ , m_limit(lm)
{}
inline bool operator()(Point const& prev,
Point const& current, Point const& next) const
{
- coordinate_type x1 = get<0>(prev);
- coordinate_type y1 = get<1>(prev);
- coordinate_type x2 = get<0>(current);
- coordinate_type y2 = get<1>(current);
+ coordinate_type const x1 = get<0>(prev);
+ coordinate_type const y1 = get<1>(prev);
+ coordinate_type const x2 = get<0>(current);
+ coordinate_type const y2 = get<1>(current);
coordinate_type dx1 = x2 - x1;
coordinate_type dy1 = y2 - y1;
@@ -338,8 +342,8 @@
// Normalize the vectors -> this results in points+direction
// and is comparible between geometries
- coordinate_type magnitude1 = sqrt(dx1 * dx1 + dy1 * dy1);
- coordinate_type magnitude2 = sqrt(dx2 * dx2 + dy2 * dy2);
+ coordinate_type const magnitude1 = std::sqrt(dx1 * dx1 + dy1 * dy1);
+ coordinate_type const magnitude2 = std::sqrt(dx2 * dx2 + dy2 * dy2);
if (magnitude1 > m_zero && magnitude2 > m_zero)
{
@@ -349,9 +353,8 @@
dy2 /= magnitude2;
// If the directions are opposite, it can be removed
- //if (geometry::math::equals(dx1, -dx2) && geometry::math::equals(dy1, -dy2))
- coordinate_type small(1e-7);
- if (abs(dx1 + dx2) < small && abs(dy1 + dy2) < small)
+ if (std::abs(dx1 + dx2) < m_limit
+ && std::abs(dy1 + dy2) < m_limit)
{
return true;
}
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -193,7 +193,7 @@
iterator_type previous = it++;
while(it != boost::end(range))
{
- //typedef segment<const point_type> segment_type;
+ //typedef segment<point_type const> segment_type;
//segment_type s(*previous, *it);
if (close_to_segment
<
@@ -266,8 +266,8 @@
Point const& selection_point,
RadiusType const& search_radius)
{
- concept::check<const Geometry>();
- concept::check<const Point>();
+ concept::check<Geometry const>();
+ concept::check<Point const>();
typedef dispatch::selected
<
Modified: sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -57,7 +57,7 @@
: m_ellipsoid(f)
{}
- inline return_type apply(const P1& p1, const P2& p2) const
+ inline return_type apply(P1 const& p1, P2 const& p2) const
{
return calc(get_as_radian<0>(p1), get_as_radian<1>(p1),
get_as_radian<0>(p2), get_as_radian<1>(p2));
@@ -69,7 +69,7 @@
typedef typename coordinate_type<P2>::type T2;
geometry::detail::ellipsoid m_ellipsoid;
- inline return_type calc(const T1& lon1, const T1& lat1, const T2& lon2, const T2& lat2) const
+ inline return_type calc(T1 const& lon1, T1 const& lat1, T2 const& lon2, T2 const& lat2) const
{
typedef double calculation_type;
calculation_type G = (lat1 - lat2) / 2.0;
Modified: sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -61,7 +61,7 @@
public :
- explicit dms_result(const T& v, axis_selector ax)
+ explicit dms_result(T const& v, axis_selector ax)
: m_angle(v)
, m_axis(ax)
{}
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -344,7 +344,7 @@
template <typename Geometry>
inline wkt_manipulator<Geometry> wkt(Geometry const& geometry)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return wkt_manipulator<Geometry>(geometry);
}
@@ -354,7 +354,7 @@
template <typename Geometry>
inline wkt_manipulator<Geometry> make_wkt(Geometry const& geometry)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return wkt_manipulator<Geometry>(geometry);
}
Modified: sandbox/geometry/boost/geometry/extensions/gis/latlong/detail/graticule.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/latlong/detail/graticule.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/latlong/detail/graticule.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -121,7 +121,7 @@
}
/// Get degrees, minutes, seconds as a string, separators can be specified optionally
- inline std::string get_dms(const std::string& ds = " ",
+ inline std::string get_dms(std::string const& ds = " ",
const std::string& ms = "'",
const std::string& ss = "\"") const
{
@@ -189,12 +189,12 @@
{}
/// Can be constructed with a NORTH dms-class
- inline explicit latitude(const dms<north,T>& v)
+ inline explicit latitude(dms<north,T> const& v)
: detail::graticule<T>(v.as_value())
{}
/// Can be constructed with a SOUTH dms-class
- inline explicit latitude(const dms<south,T>& v)
+ inline explicit latitude(dms<south,T> const& v)
: detail::graticule<T>(v.as_value())
{}
};
@@ -216,12 +216,12 @@
{}
/// Can be constructed with a WEST dms-class
- inline explicit longitude(const dms<west, T>& v)
+ inline explicit longitude(dms<west, T> const& v)
: detail::graticule<T>(v.as_value())
{}
/// Can be constructed with an EAST dms-class
- inline explicit longitude(const dms<east, T>& v)
+ inline explicit longitude(dms<east, T> const& v)
: detail::graticule<T>(v.as_value())
{}
};
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -33,11 +33,11 @@
public:
- base_v_f(const P& params) : m_proj(params) {}
+ base_v_f(P const& params) : m_proj(params) {}
virtual P params() const {return m_proj.params();}
- virtual bool forward(const LL& ll, XY& xy) const
+ virtual bool forward(LL const& ll, XY& xy) const
{
return m_proj.forward(ll, xy);
}
@@ -47,7 +47,7 @@
m_proj.fwd(lp_lon, lp_lat, xy_x, xy_y);
}
- virtual bool inverse(const XY& xy, LL& ll) const
+ virtual bool inverse(XY const& xy, LL& ll) const
{
boost::ignore_unused_variable_warning(xy);
boost::ignore_unused_variable_warning(ll);
@@ -85,9 +85,9 @@
public :
- base_v_fi(const P& params) : base_v_f<C, LL, XY, P>(params) {}
+ base_v_fi(P const& params) : base_v_f<C, LL, XY, P>(params) {}
- virtual bool inverse(const XY& xy, LL& ll) const
+ virtual bool inverse(XY const& xy, LL& ll) const
{
return this->m_proj.inverse(xy, ll);
}
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_static.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_static.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_static.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -34,13 +34,13 @@
{
public:
- inline base_t_f(const Prj& prj, const P& params)
+ inline base_t_f(Prj const& prj, P const& params)
: m_par(params), m_prj(prj)
{}
inline P params() const {return m_par;}
- inline bool forward(const LL& lp, XY& xy) const
+ inline bool forward(LL const& lp, XY& xy) const
{
try
{
@@ -77,11 +77,11 @@
struct base_t_fi : public base_t_f<Prj, LL, XY, P>
{
public :
- inline base_t_fi(const Prj& prj, const P& params)
+ inline base_t_fi(Prj const& prj, P const& params)
: base_t_f<Prj, LL, XY, P>(prj, params)
{}
- inline bool inverse(const XY& xy, LL& lp) const
+ inline bool inverse(XY const& xy, LL& lp) const
{
try
{
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -25,7 +25,7 @@
public:
virtual ~factory_entry() {}
- virtual projection<LL, XY>* create_new(const P& par) const = 0;
+ virtual projection<LL, XY>* create_new(P const& par) const = 0;
};
template <typename LL, typename XY, typename P>
@@ -34,7 +34,7 @@
public:
virtual ~base_factory() {}
- virtual void add_to_factory(const std::string& name, factory_entry<LL, XY, P>* sub) = 0;
+ virtual void add_to_factory(std::string const& name, factory_entry<LL, XY, P>* sub) = 0;
};
} // namespace detail
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -53,7 +53,7 @@
/* forward projection entry */
template <typename Prj, typename LL, typename XY, typename P>
-inline void pj_fwd(const Prj& prj, const P& par, const LL& ll, XY& xy)
+inline void pj_fwd(Prj const& prj, P const& par, LL const& ll, XY& xy)
{
using namespace detail;
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -88,7 +88,7 @@
}
template <typename T>
-inline void gauss(const GAUSS& en, T& lam, T& phi)
+inline void gauss(GAUSS const& en, T& lam, T& phi)
{
phi = 2.0 * std::atan(en.K * std::pow(std::tan(0.5 * phi + FORTPI), en.C)
* srat(en.e * std::sin(phi), en.ratexp) ) - HALFPI;
@@ -97,7 +97,7 @@
}
template <typename T>
-inline void inv_gauss(const GAUSS& en, T& lam, T& phi)
+inline void inv_gauss(GAUSS const& en, T& lam, T& phi)
{
lam /= en.C;
const double num = std::pow(std::tan(0.5 * phi + FORTPI) / en.K, 1.0 / en.C);
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -51,9 +51,13 @@
#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
-namespace boost { namespace geometry { namespace projection {
-namespace detail {
+namespace boost { namespace geometry { namespace projection
+{
+
+
+namespace detail
+{
/************************************************************************/
/* pj_init() */
@@ -64,7 +68,7 @@
/* large enough to hold projection specific parameters. */
/************************************************************************/
template <typename R>
-parameters pj_init(const R& arguments, bool use_defaults = true)
+parameters pj_init(R const& arguments, bool use_defaults = true)
{
parameters pin;
for (std::vector<std::string>::const_iterator it = boost::begin(arguments);
@@ -248,7 +252,7 @@
/* +zone=11 +ellps=WGS84". */
/************************************************************************/
-inline parameters pj_init_plus(const std::string& definition, bool use_defaults = true)
+inline parameters pj_init_plus(std::string const& definition, bool use_defaults = true)
{
static const char* sep = " +";
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -41,9 +41,11 @@
/* general inverse projection */
-namespace boost { namespace geometry { namespace projection {
+namespace boost { namespace geometry { namespace projection
+{
-namespace detail {
+namespace detail
+{
namespace inv
{
@@ -52,7 +54,7 @@
/* inverse projection entry */
template <typename PRJ, typename LL, typename XY, typename PAR>
-void pj_inv(const PRJ& prj, const PAR& par, const XY& xy, LL& ll)
+void pj_inv(PRJ const& prj, PAR const& par, XY const& xy, LL& ll)
{
/* can't do as much preliminary checking as with forward */
/* descale and de-offset */
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_param.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_param.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/pj_param.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -50,7 +50,7 @@
/* create pvalue list entry */
-inline pvalue pj_mkparam(const std::string& str)
+inline pvalue pj_mkparam(std::string const& str)
{
std::string name = str;
std::string value;
@@ -89,7 +89,7 @@
/* */
/************************************************************************/
-inline pvalue pj_param(const std::vector<pvalue>& pl, std::string opt)
+inline pvalue pj_param(std::vector<pvalue> const& pl, std::string opt)
{
char type = opt[0];
opt.erase(opt.begin());
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/projection.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/projection.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/projection.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -36,10 +36,10 @@
public :
/// Forward projection, from Latitude-Longitude to Cartesian
- virtual bool forward(const LL& lp, XY& xy) const = 0;
+ virtual bool forward(LL const& lp, XY& xy) const = 0;
/// Inverse projection, from Cartesian to Latitude-Longitude
- virtual bool inverse(const XY& xy, LL& lp) const = 0;
+ virtual bool inverse(XY const& xy, LL& lp) const = 0;
/// Forward projection using lon / lat and x / y separately
virtual void fwd(LL_T& lp_lon, LL_T& lp_lat, XY_T& xy_x, XY_T& xy_y) const = 0;
Modified: sandbox/geometry/boost/geometry/extensions/index/rtree/rtree.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/index/rtree/rtree.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/index/rtree/rtree.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -24,7 +24,8 @@
#include <boost/geometry/extensions/index/rtree/rtree_node.hpp>
#include <boost/geometry/extensions/index/rtree/rtree_leaf.hpp>
-namespace boost { namespace geometry { namespace index {
+namespace boost { namespace geometry { namespace index
+{
template <typename Box, typename Value >
class rtree
@@ -629,8 +630,8 @@
* pick_seeds algorithm.
*/
template <std::size_t D, typename T>
- void find_normalized_separations(const std::vector<Box>& boxes, T &separation,
- unsigned int &first, unsigned int &second) const
+ void find_normalized_separations(std::vector<Box> const& boxes, T& separation,
+ unsigned int& first, unsigned int& second) const
{
if (boxes.size() < 2)
{
Modified: sandbox/geometry/boost/geometry/extensions/index/rtree/rtree_leaf.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/index/rtree/rtree_leaf.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/index/rtree/rtree_leaf.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -24,7 +24,8 @@
#include <boost/geometry/extensions/index/rtree/rtree_node.hpp>
-namespace boost { namespace geometry { namespace index {
+namespace boost { namespace geometry { namespace index
+{
template <typename Box, typename Value >
class rtree_leaf : public rtree_node<Box, Value>
@@ -55,7 +56,7 @@
* If exact_match is true only return the elements having as
* key the 'box'. Otherwise return everything inside 'box'.
*/
- virtual void find(Box const& box, std::deque<Value>& result, const bool exact_match)
+ virtual void find(Box const& box, std::deque<Value>& result, bool const exact_match)
{
for (typename leaf_map::const_iterator it = m_nodes.begin();
it != m_nodes.end(); ++it)
@@ -185,7 +186,7 @@
/**
* \brief Remove value in this leaf
*/
- virtual void remove(const Value &v)
+ virtual void remove(Value const& v)
{
for (typename leaf_map::iterator it = m_nodes.begin();
it != m_nodes.end(); ++it)
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -189,7 +189,7 @@
The static method should have the signature:
template <typename Char, typename Traits>
-static inline void apply(std::basic_ostream<Char, Traits>& os, const G& geometry)
+static inline void apply(std::basic_ostream<Char, Traits>& os, G const& geometry)
*/
template <typename GeometryTag, typename Geometry>
struct svg {};
@@ -257,7 +257,7 @@
template <typename Geometry>
inline svg_manipulator<Geometry> svg(Geometry const& t, std::string const& style, int size = -1)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return svg_manipulator<Geometry>(t, style, size);
}
Modified: sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/envelope.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/envelope.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/envelope.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -47,9 +47,23 @@
{
-template <typename Nsphere, typename Box, typename Strategy>
-struct envelope<nsphere_tag, box_tag, Nsphere, Box, Strategy>
- : detail::envelope::envelope_nsphere<Nsphere, Box, Strategy>
+template
+<
+ typename Nsphere,
+ typename Box,
+ typename StrategyLess, typename StrategyGreater
+>
+struct envelope
+ <
+ nsphere_tag, box_tag,
+ Nsphere, Box,
+ StrategyLess, StrategyGreater
+ >
+ : detail::envelope::envelope_nsphere
+ <
+ Nsphere, Box,
+ StrategyLess
+ >
{};
Modified: sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/within.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/within.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/within.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -10,8 +10,10 @@
#define BOOST_GEOMETRY_EXTENSIONS_NSPHERE_ALGORITHMS_WITHIN_HPP
+#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/strategies/distance.hpp>
#include <boost/geometry/multi/core/tags.hpp>
@@ -24,7 +26,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace within {
+namespace detail { namespace within
+{
@@ -49,7 +52,6 @@
typedef typename strategy_type::return_type return_type;
P const center = geometry::make<P>(get<0>(c), get<1>(c));
- strategy_type distance;
return_type const r = geometry::distance(p, center);
return_type const rad = make_distance_result<return_type>(get_radius<0>(c));
@@ -57,7 +59,7 @@
}
/// 2D version
template<typename T, typename C>
-inline bool point_in_circle(const T& c1, const T& c2, C const& c)
+inline bool point_in_circle(T const& c1, T const& c2, C const& c)
{
typedef typename point_type<C>::type point_type;
@@ -111,7 +113,7 @@
template<typename I, typename C>
-inline bool multi_polygon_in_circle(const I& m, const C& c)
+inline bool multi_polygon_in_circle(I const& m, C const& c)
{
for (typename I::const_iterator i = m.begin(); i != m.end(); i++)
{
@@ -137,7 +139,7 @@
template <typename P, typename Circle, typename Strategy>
struct within<point_tag, nsphere_tag, P, Circle, Strategy>
{
- static inline bool apply(P const& p, Circle const& c)
+ static inline bool apply(P const& p, Circle const& c, Strategy const&)
{
return detail::within::point_in_circle(p, c);
}
@@ -146,7 +148,7 @@
template <typename Box, typename Circle, typename Strategy>
struct within<box_tag, nsphere_tag, Box, Circle, Strategy>
{
- static inline bool apply(Box const& b, Circle const& c)
+ static inline bool apply(Box const& b, Circle const& c, Strategy const&)
{
return detail::within::box_in_circle(b, c);
}
@@ -155,7 +157,7 @@
template <typename Linestring, typename Circle, typename Strategy>
struct within<linestring_tag, nsphere_tag, Linestring, Circle, Strategy>
{
- static inline bool apply(Linestring const& ln, Circle const& c)
+ static inline bool apply(Linestring const& ln, Circle const& c, Strategy const&)
{
return detail::within::range_in_circle(ln, c);
}
@@ -164,7 +166,7 @@
template <typename Ring, typename Circle, typename Strategy>
struct within<ring_tag, nsphere_tag, Ring, Circle, Strategy>
{
- static inline bool apply(Ring const& r, Circle const& c)
+ static inline bool apply(Ring const& r, Circle const& c, Strategy const&)
{
return detail::within::range_in_circle(r, c);
}
@@ -173,7 +175,7 @@
template <typename Polygon, typename Circle, typename Strategy>
struct within<polygon_tag, nsphere_tag, Polygon, Circle, Strategy>
{
- static inline bool apply(Polygon const& poly, Circle const& c)
+ static inline bool apply(Polygon const& poly, Circle const& c, Strategy const&)
{
return detail::within::polygon_in_circle(poly, c);
}
@@ -182,9 +184,9 @@
template <typename M, typename C, typename Strategy>
struct within<multi_polygon_tag, nsphere_tag, M, C, Strategy>
{
- static inline bool apply(const M& m, const C& c)
+ static inline bool apply(M const& m, C const& c)
{
- return detail::within::multi_polygon_in_circle(m, c);
+ return detail::within::multi_polygon_in_circle(m, c, Strategy const&);
}
};
Modified: sandbox/geometry/boost/geometry/extensions/nsphere/core/radius.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/nsphere/core/radius.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/nsphere/core/radius.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -21,9 +21,11 @@
#include <boost/geometry/extensions/nsphere/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
-namespace traits {
+namespace traits
+{
/*!
\brief Traits class to get/set radius of a circle/sphere/(ellipse)
@@ -38,8 +40,8 @@
- n-sphere (circle,sphere)
- upcoming ellipse
\par Specializations should provide:
- - inline static T get(const G& geometry)
- - inline static void set(G& geometry, const T& radius)
+ - inline static T get(G const& geometry)
+ - inline static void set(G& geometry, T const& radius)
\ingroup traits
*/
template <typename G, typename T, std::size_t D>
@@ -77,8 +79,8 @@
template <typename Tag, typename G, typename T, std::size_t D>
struct radius_access
{
- //static inline T get(const G& ) {}
- //static inline void set(G& g, const T& value) {}
+ //static inline T get(G const& ) {}
+ //static inline void set(G& g, T const& value) {}
};
template <typename S>
@@ -91,11 +93,11 @@
struct radius_access<nsphere_tag, S, T, D>
{
BOOST_STATIC_ASSERT((D == 0));
- static inline T get(const S& s)
+ static inline T get(S const& s)
{
return traits::radius_access<S, T, D>::get(s);
}
- static inline void set(S& s, const T& radius)
+ static inline void set(S& s, T const& radius)
{
traits::radius_access<S, T, D>::set(s, radius);
}
@@ -121,7 +123,7 @@
for ellipsoid one of the 3 equatorial radii
*/
template <std::size_t I, typename G>
-inline typename radius_type<G>::type get_radius(const G& geometry)
+inline typename radius_type<G>::type get_radius(G const& geometry)
{
typedef typename boost::remove_const<G>::type rconst;
@@ -138,7 +140,7 @@
\param radius the radius to set
*/
template <std::size_t I, typename G>
-inline void set_radius(G& geometry, const typename radius_type<G>::type& radius)
+inline void set_radius(G& geometry, typename radius_type<G>::type const& radius)
{
typedef typename boost::remove_const<G>::type rconst;
Modified: sandbox/geometry/boost/geometry/geometries/adapted/c_array.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/adapted/c_array.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/adapted/c_array.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -73,7 +73,7 @@
template <typename CoordinateType, std::size_t DimensionCount, std::size_t Dimension>
struct access<CoordinateType[DimensionCount], Dimension>
{
- static inline CoordinateType get(const CoordinateType p[DimensionCount])
+ static inline CoordinateType get(CoordinateType const p[DimensionCount])
{
return p[Dimension];
}
Modified: sandbox/geometry/boost/geometry/geometries/segment.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/segment.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/segment.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -28,7 +28,7 @@
\note The structure is like std::pair, and can often be used interchangeable.
Difference is that it refers to points, does not have points.
\note Like std::pair, points are public available.
-\note type is const or non const, so geometry::segment<P> or geometry::segment<const P>
+\note type is const or non const, so geometry::segment<P> or geometry::segment<P const>
\note We cannot derive from std::pair<P&, P&> because of
reference assignments.
\tparam ConstOrNonConstPoint point type of the segment, maybe a point or a const point
Modified: sandbox/geometry/boost/geometry/iterators/base.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/iterators/base.hpp (original)
+++ sandbox/geometry/boost/geometry/iterators/base.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -43,11 +43,11 @@
return this->base();
}
- /*inline bool operator==(const Iterator& other) const
+ /*inline bool operator==(Iterator const& other) const
{
return this->base() == other;
}
- inline bool operator!=(const Iterator& other) const
+ inline bool operator!=(Iterator const& other) const
{
return ! operator==(other);
}*/
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -25,14 +25,14 @@
namespace detail
{
template <size_t D, typename P, typename B>
- inline bool exceeding(short int dir, const P& point, const B& box)
+ inline bool exceeding(short int dir, P const& point, B const& box)
{
return (dir == 1 && get<D>(point) > get<1, D>(box))
|| (dir == -1 && get<D>(point) < get<0, D>(box));
}
template <size_t D, typename P, typename B>
- inline bool preceding(short int dir, const P& point, const B& box)
+ inline bool preceding(short int dir, P const& point, B const& box)
{
return (dir == 1 && get<D>(point) < get<0, D>(box))
|| (dir == -1 && get<D>(point) > get<1, D>(box));
@@ -50,7 +50,7 @@
{
friend class boost::iterator_core_access;
- inline section_iterator(const G& ring, const S& sections, const B& box)
+ inline section_iterator(G const& ring, S const& sections, B const& box)
: m_ring(ring)
, m_sections(sections)
, m_box(box)
@@ -115,9 +115,9 @@
typedef typename boost::range_iterator<G const>::type IT;
typedef typename boost::range_iterator<S const>::type SIT;
- const G& m_ring;
- const S& m_sections;
- const B& m_box;
+ G const& m_ring;
+ S const& m_sections;
+ B const& m_box;
IT m_end;
SIT m_section_iterator;
@@ -129,12 +129,12 @@
template<typename G, typename SEC, typename B, size_t D>
struct one_section_segment_iterator : public detail::iterators::iterator_base<
one_section_segment_iterator<G, SEC, B, D>
- , typename boost::range_iterator<G const>::type>
+ , typename boost::range_iterator<G const>::type>
{
friend class boost::iterator_core_access;
- typedef typename boost::range_iterator<G const>::type normal_iterator;
+ typedef typename boost::range_iterator<G const>::type normal_iterator;
- inline one_section_segment_iterator(const G& ring, const SEC& section, const B& box)
+ inline one_section_segment_iterator(G const& ring, SEC const& section, B const& box)
: m_box(&box)
, m_dir(section.directions[0])
{
@@ -165,7 +165,7 @@
}
// Check if iterator is still in box and if not, go to the next section and advance until it is in box
- void init(const SEC& section, const G& ring)
+ void init(SEC const& section, G const& ring)
{
//this->base_reference();
m_section_end = boost::begin(ring) + section.end_index + 1;
Modified: sandbox/geometry/boost/geometry/policies/relate/de9im.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/policies/relate/de9im.hpp (original)
+++ sandbox/geometry/boost/geometry/policies/relate/de9im.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -114,7 +114,7 @@
1, 0, 2,
true, opposite);
}
- static inline return_type collinear_b_in_a(const S2& s, bool opposite)
+ static inline return_type collinear_b_in_a(S2 const& s, bool opposite)
{
return de9im_segment(0,0,
1, 0, 1,
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -126,7 +126,7 @@
// Find most distance point, compare to the current segment
- //geometry::segment<const Point> s(begin->p, last->p);
+ //geometry::segment<Point const> s(begin->p, last->p);
return_type md(-1.0); // any value < 0
iterator_type candidate;
for(iterator_type it = begin + 1; it != last; ++it)
Modified: sandbox/geometry/boost/geometry/strategies/intersection.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/intersection.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/intersection.hpp 2010-04-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -42,8 +42,8 @@
private :
typedef typename geometry::point_type<Geometry1>::type point1_type;
typedef typename geometry::point_type<Geometry2>::type point2_type;
- typedef typename geometry::segment<const point1_type> segment1_type;
- typedef typename geometry::segment<const point2_type> segment2_type;
+ typedef typename geometry::segment<point1_type const> segment1_type;
+ typedef typename geometry::segment<point2_type const> segment2_type;
typedef segment_intersection_points
<
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -52,7 +52,7 @@
: reversible_base_view(r)
{}
- typedef typename boost::range_iterator<const Range>::type const_iterator;
+ typedef typename boost::range_iterator<Range const>::type const_iterator;
typedef typename boost::range_iterator<Range>::type iterator;
const_iterator begin() const { return boost::begin(m_range); }
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-24 08:09:54 EDT (Sat, 24 Apr 2010)
@@ -376,7 +376,7 @@
, std::string const& list_separator = ", "
)
{
- concept::check<const Geometry>();
+ concept::check<Geometry const>();
return detail::dsv::dsv_manipulator<Geometry>(geometry,
detail::dsv::dsv_settings(coordinate_separator,
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk