|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r61512 - in sandbox/geometry/boost/geometry: algorithms algorithms/detail/overlay algorithms/overlay core extensions/algorithms extensions/gis/geographic/detail extensions/gis/io/veshape extensions/gis/io/wkb extensions/gis/io/wkt extensions/gis/projections extensions/gis/projections/impl extensions/nsphere/algorithms geometries/concepts geometries/concepts/detail iterators multi/algorithms multi/algorithms/detail multi/algorithms/overlay multi/core multi/geometries/concepts multi/iterators multi/strategies/cartesian multi/util policies policies/relate strategies strategies/agnostic strategies/cartesian strategies/concepts strategies/spherical strategies/transform util
From: barend.gehrels_at_[hidden]
Date: 2010-04-23 16:53:17
Author: barendgehrels
Date: 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
New Revision: 61512
URL: http://svn.boost.org/trac/boost/changeset/61512
Log:
Stylistic changes
Text files modified:
sandbox/geometry/boost/geometry/algorithms/append.hpp | 3
sandbox/geometry/boost/geometry/algorithms/area.hpp | 6 +
sandbox/geometry/boost/geometry/algorithms/assign.hpp | 5 +
sandbox/geometry/boost/geometry/algorithms/centroid.hpp | 11 +++
sandbox/geometry/boost/geometry/algorithms/clear.hpp | 6 +
sandbox/geometry/boost/geometry/algorithms/combine.hpp | 4 +
sandbox/geometry/boost/geometry/algorithms/convert.hpp | 6 +
sandbox/geometry/boost/geometry/algorithms/convex_hull.hpp | 7 +
sandbox/geometry/boost/geometry/algorithms/correct.hpp | 8 ++
sandbox/geometry/boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp | 3
sandbox/geometry/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp | 7 +-
sandbox/geometry/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp | 3
sandbox/geometry/boost/geometry/algorithms/detail/overlay/split_rings.hpp | 37 ++++++------
sandbox/geometry/boost/geometry/algorithms/detail/overlay/stream_info.hpp | 4
sandbox/geometry/boost/geometry/algorithms/detail/overlay/traversal_info.hpp | 3
sandbox/geometry/boost/geometry/algorithms/detail/overlay/turn_info.hpp | 4 +
sandbox/geometry/boost/geometry/algorithms/detail/overlay/visit_info.hpp | 3
sandbox/geometry/boost/geometry/algorithms/distance.hpp | 3
sandbox/geometry/boost/geometry/algorithms/envelope.hpp | 3
sandbox/geometry/boost/geometry/algorithms/length.hpp | 3
sandbox/geometry/boost/geometry/algorithms/overlaps.hpp | 3
sandbox/geometry/boost/geometry/algorithms/overlay/clip_linestring.hpp | 3
sandbox/geometry/boost/geometry/algorithms/overlay/copy_segment_point.hpp | 6 +
sandbox/geometry/boost/geometry/algorithms/overlay/copy_segments.hpp | 6 +
sandbox/geometry/boost/geometry/algorithms/overlay/self_turn_points.hpp | 3
sandbox/geometry/boost/geometry/algorithms/overlay/traverse.hpp | 20 ++----
sandbox/geometry/boost/geometry/algorithms/simplify.hpp | 3
sandbox/geometry/boost/geometry/algorithms/transform.hpp | 3
sandbox/geometry/boost/geometry/algorithms/within.hpp | 3
sandbox/geometry/boost/geometry/core/coordinate_type.hpp | 7 +
sandbox/geometry/boost/geometry/core/exception.hpp | 3
sandbox/geometry/boost/geometry/core/exterior_ring.hpp | 6 +
sandbox/geometry/boost/geometry/core/geometry_id.hpp | 3
sandbox/geometry/boost/geometry/core/is_linear.hpp | 3
sandbox/geometry/boost/geometry/core/is_multi.hpp | 3
sandbox/geometry/boost/geometry/core/radian_access.hpp | 6 +
sandbox/geometry/boost/geometry/core/replace_point_type.hpp | 3
sandbox/geometry/boost/geometry/core/reverse_dispatch.hpp | 3
sandbox/geometry/boost/geometry/core/topological_dimension.hpp | 6 +
sandbox/geometry/boost/geometry/extensions/algorithms/remove_holes_if.hpp | 6 +
sandbox/geometry/boost/geometry/extensions/gis/geographic/detail/ellipsoid.hpp | 3
sandbox/geometry/boost/geometry/extensions/gis/io/veshape/write_veshape.hpp | 6 +
sandbox/geometry/boost/geometry/extensions/gis/io/wkb/utility.hpp | 4 +
sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp | 6 +
sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp | 6 +
sandbox/geometry/boost/geometry/extensions/gis/projections/epsg.hpp | 2
sandbox/geometry/boost/geometry/extensions/gis/projections/epsg_traits.hpp | 5 +
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/aasincos.hpp | 10 ++
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/adjlon.hpp | 6 +
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp | 3
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/base_static.hpp | 11 +--
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp | 6 +
sandbox/geometry/boost/geometry/extensions/gis/projections/impl/function_overloads.hpp | 3
sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/area.hpp | 6 +
sandbox/geometry/boost/geometry/geometries/concepts/box_concept.hpp | 4
sandbox/geometry/boost/geometry/geometries/concepts/check.hpp | 12 ++-
sandbox/geometry/boost/geometry/geometries/concepts/detail/check_append.hpp | 3
sandbox/geometry/boost/geometry/geometries/concepts/detail/check_clear.hpp | 3
sandbox/geometry/boost/geometry/geometries/concepts/point_concept.hpp | 3
sandbox/geometry/boost/geometry/geometries/concepts/polygon_concept.hpp | 4 +
sandbox/geometry/boost/geometry/geometries/concepts/ring_concept.hpp | 3
sandbox/geometry/boost/geometry/geometries/concepts/segment_concept.hpp | 7 -
sandbox/geometry/boost/geometry/iterators/base.hpp | 3
sandbox/geometry/boost/geometry/iterators/range_type.hpp | 3
sandbox/geometry/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp | 3
sandbox/geometry/boost/geometry/multi/algorithms/envelope.hpp | 5 -
sandbox/geometry/boost/geometry/multi/algorithms/num_points.hpp | 6 +
sandbox/geometry/boost/geometry/multi/algorithms/overlay/copy_segments.hpp | 6 +
sandbox/geometry/boost/geometry/multi/algorithms/simplify.hpp | 3
sandbox/geometry/boost/geometry/multi/algorithms/transform.hpp | 3
sandbox/geometry/boost/geometry/multi/algorithms/within.hpp | 5 +
sandbox/geometry/boost/geometry/multi/core/geometry_id.hpp | 4
sandbox/geometry/boost/geometry/multi/core/is_multi.hpp | 5 -
sandbox/geometry/boost/geometry/multi/core/point_type.hpp | 7 +-
sandbox/geometry/boost/geometry/multi/core/topological_dimension.hpp | 4 +
sandbox/geometry/boost/geometry/multi/geometries/concepts/check.hpp | 3
sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp | 3
sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp | 3
sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp | 4 +
sandbox/geometry/boost/geometry/multi/iterators/range_type.hpp | 4 +
sandbox/geometry/boost/geometry/multi/strategies/cartesian/centroid_average.hpp | 3
sandbox/geometry/boost/geometry/multi/util/write_dsv.hpp | 6 +
sandbox/geometry/boost/geometry/policies/compare.hpp | 5 +
sandbox/geometry/boost/geometry/policies/relate/de9im.hpp | 3
sandbox/geometry/boost/geometry/policies/relate/direction.hpp | 3
sandbox/geometry/boost/geometry/policies/relate/intersection_points.hpp | 3
sandbox/geometry/boost/geometry/policies/relate/intersection_points_determinant.hpp | 3
sandbox/geometry/boost/geometry/policies/relate/intersection_points_slope.hpp | 3
sandbox/geometry/boost/geometry/policies/relate/tupled.hpp | 3
sandbox/geometry/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp | 3
sandbox/geometry/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp | 3
sandbox/geometry/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp | 3
sandbox/geometry/boost/geometry/strategies/cartesian/area_by_triangles.hpp | 3
sandbox/geometry/boost/geometry/strategies/cartesian/cart_intersect.hpp | 4 +
sandbox/geometry/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp | 3
sandbox/geometry/boost/geometry/strategies/cartesian/distance_projected_point.hpp | 9 ++-
sandbox/geometry/boost/geometry/strategies/cartesian/distance_pythagoras.hpp | 6 +
sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp | 3
sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp | 3
sandbox/geometry/boost/geometry/strategies/cartesian/side_by_triangle.hpp | 114 +++++++++++++++++++--------------------
sandbox/geometry/boost/geometry/strategies/compare.hpp | 7 +
sandbox/geometry/boost/geometry/strategies/concepts/area_concept.hpp | 6 +-
sandbox/geometry/boost/geometry/strategies/concepts/centroid_concept.hpp | 5 +
sandbox/geometry/boost/geometry/strategies/concepts/convex_hull_concept.hpp | 5 +
sandbox/geometry/boost/geometry/strategies/concepts/distance_concept.hpp | 5 +
sandbox/geometry/boost/geometry/strategies/concepts/segment_intersect_concept.hpp | 3
sandbox/geometry/boost/geometry/strategies/concepts/simplify_concept.hpp | 3
sandbox/geometry/boost/geometry/strategies/concepts/within_concept.hpp | 3
sandbox/geometry/boost/geometry/strategies/distance_result.hpp | 3
sandbox/geometry/boost/geometry/strategies/spherical/area_huiller.hpp | 3
sandbox/geometry/boost/geometry/strategies/spherical/compare_circular.hpp | 12 +++-
sandbox/geometry/boost/geometry/strategies/spherical/distance_cross_track.hpp | 3
sandbox/geometry/boost/geometry/strategies/spherical/distance_haversine.hpp | 3
sandbox/geometry/boost/geometry/strategies/spherical/side_by_cross_track.hpp | 109 ++++++++++++++++++-------------------
sandbox/geometry/boost/geometry/strategies/strategy_transform.hpp | 3
sandbox/geometry/boost/geometry/strategies/transform/map_transformer.hpp | 5 +
sandbox/geometry/boost/geometry/strategies/transform/matrix_transformers.hpp | 12 +++-
sandbox/geometry/boost/geometry/util/as_range.hpp | 3
sandbox/geometry/boost/geometry/util/copy.hpp | 3
sandbox/geometry/boost/geometry/util/for_each_range.hpp | 3
sandbox/geometry/boost/geometry/util/get_cs_as_radian.hpp | 9 +-
sandbox/geometry/boost/geometry/util/math.hpp | 3
sandbox/geometry/boost/geometry/util/reversible_view.hpp | 3
sandbox/geometry/boost/geometry/util/select_most_precise.hpp | 3
sandbox/geometry/boost/geometry/util/write_dsv.hpp | 15 ++--
125 files changed, 506 insertions(+), 330 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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -26,7 +26,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace append {
+namespace detail { namespace append
+{
template <typename Geometry, typename Point, bool UseStd>
struct append_point {};
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -61,7 +61,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace area {
+namespace detail { namespace area
+{
template<typename Box, typename Strategy>
struct box_area
@@ -155,7 +156,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template
<
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -9,6 +9,7 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_ASSIGN_HPP
#define BOOST_GEOMETRY_ALGORITHMS_ASSIGN_HPP
+
#include <cstddef>
#include <boost/concept/requires.hpp>
@@ -35,7 +36,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace assign {
+namespace detail { namespace assign
+{
template <typename CoordinateType>
struct assign_operation
@@ -528,4 +530,5 @@
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_ALGORITHMS_ASSIGN_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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -10,6 +10,7 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_CENTROID_HPP
#define BOOST_GEOMETRY_ALGORITHMS_CENTROID_HPP
+
#include <cstddef>
#include <boost/range.hpp>
@@ -67,6 +68,7 @@
namespace boost { namespace geometry
{
+
class centroid_exception : public geometry::exception
{
public:
@@ -79,8 +81,10 @@
}
};
+
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace centroid {
+namespace detail { namespace centroid
+{
template<typename Point, typename PointCentroid, typename Strategy>
struct centroid_point
@@ -122,6 +126,7 @@
}
};
+
template<typename Box, typename Point, std::size_t DimensionCount>
struct centroid_box_calculator<Box, Point, DimensionCount, DimensionCount>
{
@@ -130,6 +135,7 @@
}
};
+
template<typename Box, typename Point, typename Strategy>
struct centroid_box
{
@@ -144,6 +150,7 @@
}
};
+
// There is one thing where centroid is different from e.g. within.
// If the ring has only one point, it might make sense that
// that point is the centroid.
@@ -462,6 +469,8 @@
return c;
}
+
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_ALGORITHMS_CENTROID_HPP
Modified: sandbox/geometry/boost/geometry/algorithms/clear.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/clear.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/clear.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -9,6 +9,7 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_CLEAR_HPP
#define BOOST_GEOMETRY_ALGORITHMS_CLEAR_HPP
+
#include <boost/type_traits/remove_const.hpp>
#include <boost/geometry/core/access.hpp>
@@ -22,7 +23,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace clear {
+namespace detail { namespace clear
+{
template <typename Geometry>
struct use_std_clear
@@ -136,6 +138,8 @@
>::apply(geometry);
}
+
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_ALGORITHMS_CLEAR_HPP
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -9,6 +9,7 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_COMBINE_HPP
#define BOOST_GEOMETRY_ALGORITHMS_COMBINE_HPP
+
#include <cstddef>
#include <boost/numeric/conversion/cast.hpp>
@@ -36,7 +37,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace combine {
+namespace detail { namespace combine
+{
template
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -9,6 +9,7 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_CONVERT_HPP
#define BOOST_GEOMETRY_ALGORITHMS_CONVERT_HPP
+
#include <cstddef>
#include <boost/numeric/conversion/cast.hpp>
@@ -38,7 +39,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace convert {
+namespace detail { namespace convert
+{
template
<
@@ -266,6 +268,8 @@
>::apply(geometry1, geometry2);
}
+
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_ALGORITHMS_CONVERT_HPP
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -70,10 +70,12 @@
points of same type as the input geometry type
*/
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace convex_hull {
+namespace detail { namespace convex_hull
+{
template
<
@@ -276,4 +278,5 @@
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_ALGORITHMS_CONVEX_HULL_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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -9,8 +9,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_CORRECT_HPP
#define BOOST_GEOMETRY_ALGORITHMS_CORRECT_HPP
-#include <cstddef>
+
#include <algorithm>
+#include <cstddef>
#include <functional>
#include <boost/range.hpp>
@@ -30,7 +31,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace correct {
+namespace detail { namespace correct
+{
template <typename Box, std::size_t Dimension, std::size_t DimensionCount>
@@ -188,6 +190,8 @@
dispatch::correct<typename tag<Geometry>::type, Geometry>::apply(geometry);
}
+
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_ALGORITHMS_CORRECT_HPP
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -17,7 +17,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
+namespace detail { namespace overlay
+{
/*!
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -17,13 +17,14 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
+namespace detail { namespace overlay
+{
/*!
\brief Keeps info to enrich intersection info (per source)
- \details Class to keep information necessary for traversal phase (a phase
- of the overlay process). The information is gathered during the
+ \details Class to keep information necessary for traversal phase (a phase
+ of the overlay process). The information is gathered during the
enrichment phase
*/
template<typename P>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -17,7 +17,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
+namespace detail { namespace overlay
+{
/*!
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -10,8 +10,9 @@
#define BOOST_GEOMETRY_CHECK_SPLIT_RINGS
-//#include <boost/foreach.hpp>
+
#include <deque>
+#include <string>
#include <boost/range.hpp>
@@ -71,7 +72,7 @@
--> we use id1+1
- After that, we need to update all indices AFTER IP.
+ After that, we need to update all indices AFTER IP.
We removed two vertices here (4-2), and added one (the IP)
*/
@@ -218,7 +219,7 @@
return left.count_between < right.count_between;
}
- if (left.operations[0].seg_id.segment_index
+ if (left.operations[0].seg_id.segment_index
== right.operations[0].seg_id.segment_index)
{
return left.operations[0].distance < right.operations[0].distance;
@@ -247,7 +248,7 @@
struct split_turn_info : detail::overlay::turn_info
<
P, split_turn_operation<P>
- >
+ >
{
//std::string history;
int count_between; // counts number of segments between ring in intersection
@@ -305,8 +306,8 @@
std::cout << header << std::endl;
BOOST_FOREACH(typename boost::range_value<Turns>::type const& turn, turns)
{
- std::cout
- << "I at " << turn.operations[0].seg_id.segment_index
+ std::cout
+ << "I at " << turn.operations[0].seg_id.segment_index
<< "/" << turn.operations[1].seg_id.segment_index
<< " (" << turn.count_between
<< ") " << turn.operations[0].distance
@@ -329,7 +330,7 @@
)
{
if (op.seg_id.segment_index < second.seg_id.segment_index
- || (op.seg_id.segment_index == second.seg_id.segment_index
+ || (op.seg_id.segment_index == second.seg_id.segment_index
&& op.distance < second.distance)
)
{
@@ -366,9 +367,9 @@
// Make operations[0].seg_id always the smallest, to sort properly
// Also calculate the number of segments in between
- for (typename boost::range_iterator<turns_type>::type
+ for (typename boost::range_iterator<turns_type>::type
it = boost::begin(turns);
- it != boost::end(turns);
+ it != boost::end(turns);
++it)
{
turn_info& turn = *it;
@@ -388,13 +389,13 @@
turn.count_between = (std::min)(between1, between2);
*/
- turn.count_between = between1;
+ turn.count_between = between1;
}
//report(turns, "swapped");
std::sort(turns.begin(), turns.end(), sorter<turn_info>());
//report(turns, "sorted");
-
+
while(turns.size() > 0)
{
@@ -403,7 +404,7 @@
split_turn_operation<point_type> const& first_op = turn.operations[0];
split_turn_operation<point_type> const& second_op = turn.operations[1];
- bool do_split = first_op.seg_id.segment_index >= 0
+ bool do_split = first_op.seg_id.segment_index >= 0
&& second_op.seg_id.segment_index >= 0;
if (do_split)
@@ -422,8 +423,8 @@
geometry::get_turns
<
split_calculate_distance_policy
- >(ring_collection.back(),
- splitted_turns,
+ >(ring_collection.back(),
+ splitted_turns,
detail::get_turns::no_interrupt_policy());
if (splitted_turns.size() > 0)
@@ -444,9 +445,9 @@
if (do_split)
{
- for (typename boost::range_iterator<turns_type>::type
+ for (typename boost::range_iterator<turns_type>::type
rest = boost::begin(turns);
- rest != boost::end(turns);
+ rest != boost::end(turns);
++rest)
{
//turn_info copy = turn;
@@ -454,7 +455,7 @@
|| adapt(rest->operations[1], first_op, second_op))
{
/**
- std::cout << " ADAPTED "
+ std::cout << " ADAPTED "
<< copy.operations[0].seg_id.segment_index << "/" << copy.operations[1].seg_id.segment_index
<< " "
<< geometry::wkt(copy.point) << std::endl;
@@ -462,7 +463,7 @@
}
}
}
- while(turns.size() > 0
+ while(turns.size() > 0
&& (turns.front().operations[0].seg_id.segment_index < 0
|| turns.front().operations[1].seg_id.segment_index < 0))
{
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/stream_info.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/stream_info.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/stream_info.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,8 +18,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
-
+namespace detail { namespace overlay
+{
static inline std::string dir(int d)
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/traversal_info.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/traversal_info.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/traversal_info.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,7 +19,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
+namespace detail { namespace overlay
+{
template <typename P>
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/turn_info.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/turn_info.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/turn_info.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -8,6 +8,7 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP
+
#include <boost/array.hpp>
#include <boost/geometry/algorithms/overlay/segment_identifier.hpp>
@@ -16,7 +17,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
+namespace detail { namespace overlay
+{
enum operation_type
Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/visit_info.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/visit_info.hpp (original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/visit_info.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
+namespace detail { namespace overlay
+{
#if ! defined(BOOST_GEOMETRY_USE_MSM)
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -60,7 +60,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace distance {
+namespace detail { namespace distance
+{
template <typename P1, typename P2, typename Strategy>
struct point_to_point
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -60,7 +60,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace envelope {
+namespace detail { namespace envelope
+{
/// Calculate envelope of an 2D or 3D segment
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -47,7 +47,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace length {
+namespace detail { namespace length
+{
template<typename Segment, typename Strategy>
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -30,7 +30,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlaps {
+namespace detail { namespace overlaps
+{
template
<
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -139,7 +139,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace intersection {
+namespace detail { namespace intersection
+{
/*!
\brief Clips a linestring with a box
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -28,7 +28,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace copy_segments {
+namespace detail { namespace copy_segments
+{
template <typename Range, typename SegmentIdentifier, typename PointOut>
@@ -120,7 +121,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -33,7 +33,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace copy_segments {
+namespace detail { namespace copy_segments
+{
template <typename Ring, typename SegmentIdentifier, typename RangeOut>
@@ -148,7 +149,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -28,7 +28,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace self_get_turn_points {
+namespace detail { namespace self_get_turn_points
+{
template
<
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -13,32 +13,28 @@
#include <boost/range.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/overlay/copy_segments.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>
-
-#include <boost/geometry/algorithms/overlay/copy_segments.hpp>
-
#include <boost/geometry/geometries/concepts/check.hpp>
+
#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT)
-#include <string>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+# include <string>
+# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+# include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
#endif
-#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
-
-
-#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
namespace boost { namespace geometry
{
-
-
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay {
+namespace detail { namespace overlay
+{
template <typename Turns>
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -67,7 +67,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace simplify {
+namespace detail { namespace simplify
+{
template<typename Range, typename Strategy>
struct simplify_range_inserter
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -65,7 +65,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace transform {
+namespace detail { namespace transform
+{
template <typename Point1, typename Point2, typename Strategy>
struct transform_point
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -65,7 +65,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace within {
+namespace detail { namespace within
+{
/*!
Modified: sandbox/geometry/boost/geometry/core/coordinate_type.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/coordinate_type.hpp (original)
+++ sandbox/geometry/boost/geometry/core/coordinate_type.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -13,9 +13,12 @@
#include <boost/geometry/core/point_type.hpp>
-namespace boost { namespace geometry {
-namespace traits {
+namespace boost { namespace geometry
+{
+
+namespace traits
+{
/*!
\brief Traits class which indicate the coordinate type (double,float,...) of a point
Modified: sandbox/geometry/boost/geometry/core/exception.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/exception.hpp (original)
+++ sandbox/geometry/boost/geometry/core/exception.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -11,7 +11,8 @@
#include <exception>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
/*!
\brief Base exception class for GGL
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,9 +20,11 @@
#include <boost/geometry/util/add_const_if_c.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
-namespace traits {
+namespace traits
+{
/*!
Modified: sandbox/geometry/boost/geometry/core/geometry_id.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/geometry_id.hpp (original)
+++ sandbox/geometry/boost/geometry/core/geometry_id.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,7 +19,8 @@
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
Modified: sandbox/geometry/boost/geometry/core/is_linear.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/is_linear.hpp (original)
+++ sandbox/geometry/boost/geometry/core/is_linear.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
Modified: sandbox/geometry/boost/geometry/core/is_multi.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/is_multi.hpp (original)
+++ sandbox/geometry/boost/geometry/core/is_multi.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -22,11 +22,13 @@
#include <boost/geometry/util/math.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail {
+namespace detail
+{
template<std::size_t Dimension, typename Geometry>
struct degree_radian_converter
Modified: sandbox/geometry/boost/geometry/core/replace_point_type.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/replace_point_type.hpp (original)
+++ sandbox/geometry/boost/geometry/core/replace_point_type.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -29,7 +29,8 @@
#include <boost/geometry/geometries/box.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
namespace core_dispatch
Modified: sandbox/geometry/boost/geometry/core/reverse_dispatch.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/reverse_dispatch.hpp (original)
+++ sandbox/geometry/boost/geometry/core/reverse_dispatch.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,7 +20,8 @@
#include <boost/geometry/core/geometry_id.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
Modified: sandbox/geometry/boost/geometry/core/topological_dimension.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/core/topological_dimension.hpp (original)
+++ sandbox/geometry/boost/geometry/core/topological_dimension.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,11 +19,13 @@
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch {
+namespace core_dispatch
+{
template <typename GeometryTag>
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/remove_holes_if.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/remove_holes_if.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/remove_holes_if.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -28,7 +28,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace remove_holes_if {
+namespace detail { namespace remove_holes_if
+{
template<typename Polygon, typename Predicate>
@@ -53,7 +54,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
// Default implementation does nothing
template <typename Tag, typename Geometry, typename Predicate>
Modified: sandbox/geometry/boost/geometry/extensions/gis/geographic/detail/ellipsoid.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/geographic/detail/ellipsoid.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/geographic/detail/ellipsoid.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -10,7 +10,8 @@
#define BOOST_GEOMETRY_EXTENSIONS_GIS_GEOGRAPHIC_DETAIL_ELLIPSOID_HPP
-namespace boost { namespace geometry { namespace detail {
+namespace boost { namespace geometry { namespace detail
+{
/*!
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -33,7 +33,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace veshape {
+namespace detail { namespace veshape
+{
// Define the coordinate streamer, specialized for either 2 or 3 dimensions.
@@ -193,7 +194,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
/*!
\brief Dispatching base struct for VEShape streaming, specialized below per geometry type
Modified: sandbox/geometry/boost/geometry/extensions/gis/io/wkb/utility.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/io/wkb/utility.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/io/wkb/utility.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -15,7 +15,8 @@
#include <boost/cstdint.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
// TODO: Waiting for errors handling design, eventually return bool
// may be replaced to throw exception.
@@ -84,6 +85,7 @@
return hex.size() == (2 * std::distance(begin, end));
}
+
}} // namespace boost::geometry
#endif // BOOST_GEOMETRY_IO_WKB_UTILITY_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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -37,7 +37,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace wkt {
+namespace detail { namespace wkt
+{
template <typename P, int I, int Count>
struct stream_coordinate
@@ -217,7 +218,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template <typename Tag, typename Geometry>
struct wkt {};
Modified: sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,7 +20,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace wkt {
+namespace detail { namespace wkt
+{
template <typename Multi, typename StreamPolicy, typename PrefixPolicy>
@@ -55,7 +56,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template <typename Multi>
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/epsg.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/epsg.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/epsg.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,6 +19,8 @@
namespace boost { namespace geometry { namespace projection
{
+
+
#ifndef DOXYGEN_NO_DETAIL
namespace detail
{
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/epsg_traits.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/epsg_traits.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/epsg_traits.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -13,7 +13,8 @@
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-namespace boost { namespace geometry { namespace projection {
+namespace boost { namespace geometry { namespace projection
+{
/*!
\brief EPSG traits
@@ -34,7 +35,9 @@
// - function par to get parameters
};
+
}}} // namespace boost::geometry::projection
+
#endif
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/aasincos.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/aasincos.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/aasincos.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -37,9 +37,11 @@
#include <cmath>
-namespace boost { namespace geometry { namespace projection {
+namespace boost { namespace geometry { namespace projection
+{
-namespace detail {
+namespace detail
+{
namespace aasincos
{
@@ -90,7 +92,11 @@
return ((std::fabs(n) < aasincos::ATOL && std::fabs(d) < aasincos::ATOL) ? 0.0 : std::atan2(n, d));
}
+
} // namespace detail
+
+
}}} // namespace boost::geometry::projection
+
#endif // BOOST_GEOMETRY_PROJECTIONS_IMPL_AASINCOS_HPP
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/adjlon.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/adjlon.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/adjlon.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -39,9 +39,11 @@
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
-namespace boost { namespace geometry { namespace projection {
+namespace boost { namespace geometry { namespace projection
+{
-namespace detail {
+namespace detail
+{
/* reduce argument to range +/- PI */
inline double adjlon (double lon)
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -15,7 +15,8 @@
#include <boost/geometry/extensions/gis/projections/projection.hpp>
-namespace boost { namespace geometry { namespace projection {
+namespace boost { namespace geometry { namespace projection
+{
#ifndef DOXYGEN_NO_DETAIL
namespace detail
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,13 +20,8 @@
#include <boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_inv.hpp>
-namespace boost { namespace geometry { namespace projection {
-
-
-
-
-
-
+namespace boost { namespace geometry { namespace projection
+{
#ifndef DOXYGEN_NO_DETAIL
@@ -103,6 +98,8 @@
} // namespace detail
#endif // DOXYGEN_NO_DETAIL
+
}}} // namespace boost::geometry::projection
+
#endif // BOOST_GEOMETRY_PROJECTIONS_IMPL_BASE_STATIC_HPP
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -13,9 +13,11 @@
#include <boost/geometry/extensions/gis/projections/projection.hpp>
-namespace boost { namespace geometry { namespace projection {
+namespace boost { namespace geometry { namespace projection
+{
-namespace detail {
+namespace detail
+{
template <typename LL, typename XY, typename P>
class factory_entry
Modified: sandbox/geometry/boost/geometry/extensions/gis/projections/impl/function_overloads.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/projections/impl/function_overloads.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/projections/impl/function_overloads.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -11,7 +11,8 @@
#include <cmath>
-namespace boost { namespace geometry { namespace projection {
+namespace boost { namespace geometry { namespace projection
+{
// Functions to resolve ambiguity when compiling with coordinates of different types
/*inline double atan2(double a, double b)
Modified: sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/area.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/area.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/nsphere/algorithms/area.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,7 +20,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace area {
+namespace detail { namespace area
+{
template<typename C, typename S>
struct circle_area
@@ -55,7 +56,8 @@
#endif // DOXYGEN_NO_DETAIL
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template <typename Geometry, order_selector Order, typename Strategy>
Modified: sandbox/geometry/boost/geometry/geometries/concepts/box_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/box_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/box_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -21,8 +21,8 @@
#include <boost/geometry/core/point_type.hpp>
-
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
Modified: sandbox/geometry/boost/geometry/geometries/concepts/check.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/check.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/check.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -71,11 +71,13 @@
#include <boost/geometry/geometries/concepts/ring_concept.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace concept_check {
+namespace detail { namespace concept_check
+{
template <typename Concept>
class check
@@ -152,11 +154,13 @@
-namespace concept {
+namespace concept
+{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail {
+namespace detail
+{
template <typename Geometry, bool IsConst>
Modified: sandbox/geometry/boost/geometry/geometries/concepts/detail/check_append.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/detail/check_append.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/detail/check_append.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -16,7 +16,8 @@
#include <boost/geometry/core/access.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
#ifndef DOXYGEN_NO_DETAIL
namespace detail
Modified: sandbox/geometry/boost/geometry/geometries/concepts/detail/check_clear.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/detail/check_clear.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/detail/check_clear.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -16,7 +16,8 @@
#include <boost/geometry/core/access.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
#ifndef DOXYGEN_NO_DETAIL
Modified: sandbox/geometry/boost/geometry/geometries/concepts/point_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/point_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/point_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,7 +20,8 @@
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
\brief Point concept.
Modified: sandbox/geometry/boost/geometry/geometries/concepts/polygon_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/polygon_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/polygon_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -21,7 +21,9 @@
#include <boost/geometry/geometries/concepts/point_concept.hpp>
#include <boost/geometry/geometries/concepts/ring_concept.hpp>
-namespace boost { namespace geometry { namespace concept {
+
+namespace boost { namespace geometry { namespace concept
+{
/*!
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 16:53:06 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
+{
/*!
Modified: sandbox/geometry/boost/geometry/geometries/concepts/segment_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/concepts/segment_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/concepts/segment_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -6,7 +6,6 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-
#ifndef BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_SEGMENT_CONCEPT_HPP
#define BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_SEGMENT_CONCEPT_HPP
@@ -15,14 +14,12 @@
#include <boost/geometry/geometries/concepts/point_concept.hpp>
-
-
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/point_type.hpp>
-
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -15,7 +15,8 @@
#include <boost/mpl/if.hpp>
#ifndef DOXYGEN_NO_DETAIL
-namespace boost { namespace geometry { namespace detail { namespace iterators {
+namespace boost { namespace geometry { namespace detail { namespace iterators
+{
template <typename T, typename Iterator>
struct iterator_base :
Modified: sandbox/geometry/boost/geometry/iterators/range_type.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/iterators/range_type.hpp (original)
+++ sandbox/geometry/boost/geometry/iterators/range_type.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -16,7 +16,8 @@
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail {
+namespace detail
+{
template <typename MultiGeometry, typename Predicate, typename Policy>
struct multi_modify_with_predicate
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -25,7 +25,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace envelope {
+namespace detail { namespace envelope
+{
template<typename MultiLinestring, typename Box>
@@ -105,8 +106,6 @@
#endif
-
-
}} // namespace boost::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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -21,7 +21,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace num_points {
+namespace detail { namespace num_points
+{
template <typename MultiGeometry>
@@ -54,7 +55,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template <typename Geometry>
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -23,7 +23,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace copy_segments {
+namespace detail { namespace copy_segments
+{
template
@@ -58,7 +59,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -23,7 +23,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace simplify {
+namespace detail { namespace simplify
+{
template<typename MultiGeometry, typename Strategy, typename Policy>
struct simplify_multi
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,7 +19,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace transform {
+namespace detail { namespace transform
+{
/*!
\brief Is able to transform any multi-geometry, calling the single-version as policy
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,7 +19,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace within {
+namespace detail { namespace within
+{
template
@@ -50,9 +51,11 @@
}
};
+
}} // namespace detail::within
#endif // DOXYGEN_NO_DETAIL
+
#ifndef DOXYGEN_NO_DISPATCH
namespace dispatch
{
Modified: sandbox/geometry/boost/geometry/multi/core/geometry_id.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/core/geometry_id.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/core/geometry_id.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -21,7 +21,8 @@
#include <boost/geometry/multi/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
@@ -40,7 +41,6 @@
struct geometry_id<multi_polygon_tag> : boost::mpl::int_<6> {};
-
} // namespace core_dispatch
#endif
Modified: sandbox/geometry/boost/geometry/multi/core/is_multi.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/core/is_multi.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/core/is_multi.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
#include <boost/geometry/multi/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
@@ -41,8 +42,6 @@
#endif
-
-
}} // namespace boost::geometry
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
namespace core_dispatch
@@ -48,11 +49,11 @@
};
-
-
}
#endif
+
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_MULTI_CORE_POINT_TYPE_HPP
Modified: sandbox/geometry/boost/geometry/multi/core/topological_dimension.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/core/topological_dimension.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/core/topological_dimension.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
#include <boost/geometry/multi/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
namespace core_dispatch
@@ -39,6 +40,7 @@
} // namespace core_dispatch
#endif
+
}} // namespace boost::geometry
Modified: sandbox/geometry/boost/geometry/multi/geometries/concepts/check.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/geometries/concepts/check.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/geometries/concepts/check.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -21,7 +21,8 @@
#include <boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
Modified: sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,7 +19,8 @@
#include <boost/geometry/geometries/concepts/linestring_concept.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
Modified: sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -19,7 +19,8 @@
#include <boost/geometry/geometries/concepts/point_concept.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
#include <boost/geometry/geometries/concepts/polygon_concept.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
@@ -73,6 +74,7 @@
#endif
};
+
}}} // namespace boost::geometry::concept
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -15,7 +15,9 @@
#include <boost/geometry/iterators/range_type.hpp>
-namespace boost { namespace geometry {
+
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
namespace dispatch
Modified: sandbox/geometry/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/multi/strategies/cartesian/centroid_average.hpp (original)
+++ sandbox/geometry/boost/geometry/multi/strategies/cartesian/centroid_average.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -23,7 +23,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace centroid_ {
+namespace strategy { namespace centroid_
+{
template
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -17,7 +17,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace dsv {
+namespace detail { namespace dsv
+{
template <typename MultiGeometry>
@@ -52,7 +53,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template <typename Tag, typename Geometry>
Modified: sandbox/geometry/boost/geometry/policies/compare.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/policies/compare.hpp (original)
+++ sandbox/geometry/boost/geometry/policies/compare.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -49,12 +49,14 @@
#include <boost/geometry/strategies/compare.hpp>
#include <boost/geometry/util/math.hpp>
+
namespace boost { namespace geometry
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace compare {
+namespace detail { namespace compare
+{
template
@@ -270,4 +272,5 @@
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_POLICIES_COMPARE_HPP
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-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
namespace boost { namespace geometry
{
-namespace policies { namespace relate {
+namespace policies { namespace relate
+{
template <typename S1, typename S2>
Modified: sandbox/geometry/boost/geometry/policies/relate/direction.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/policies/relate/direction.hpp (original)
+++ sandbox/geometry/boost/geometry/policies/relate/direction.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -26,7 +26,8 @@
{
-namespace policies { namespace relate {
+namespace policies { namespace relate
+{
struct direction_type
{
Modified: sandbox/geometry/boost/geometry/policies/relate/intersection_points.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/policies/relate/intersection_points.hpp (original)
+++ sandbox/geometry/boost/geometry/policies/relate/intersection_points.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -25,7 +25,8 @@
namespace boost { namespace geometry
{
-namespace policies { namespace relate {
+namespace policies { namespace relate
+{
template <typename S1, typename S2, typename ReturnType, typename CalculationType = void>
Modified: sandbox/geometry/boost/geometry/policies/relate/intersection_points_determinant.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/policies/relate/intersection_points_determinant.hpp (original)
+++ sandbox/geometry/boost/geometry/policies/relate/intersection_points_determinant.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -24,7 +24,8 @@
namespace boost { namespace geometry
{
-namespace policies { namespace relate {
+namespace policies { namespace relate
+{
template <typename S1, typename S2, typename ReturnType, typename CalculationType = void>
Modified: sandbox/geometry/boost/geometry/policies/relate/intersection_points_slope.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/policies/relate/intersection_points_slope.hpp (original)
+++ sandbox/geometry/boost/geometry/policies/relate/intersection_points_slope.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -24,7 +24,8 @@
namespace boost { namespace geometry
{
-namespace policies { namespace relate {
+namespace policies { namespace relate
+{
template <typename S1, typename S2, typename ReturnType, typename CalculationType = void>
Modified: sandbox/geometry/boost/geometry/policies/relate/tupled.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/policies/relate/tupled.hpp (original)
+++ sandbox/geometry/boost/geometry/policies/relate/tupled.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,7 +20,8 @@
namespace boost { namespace geometry
{
-namespace policies { namespace relate {
+namespace policies { namespace relate
+{
// "tupled" to return intersection results together.
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -36,7 +36,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace convex_hull {
+namespace strategy { namespace convex_hull
+{
#ifndef DOXYGEN_NO_DETAIL
namespace detail
Modified: sandbox/geometry/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,7 +20,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace within {
+namespace strategy { namespace within
+{
/*!
\brief Within detection using winding rule
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -30,7 +30,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace simplify {
+namespace strategy { namespace simplify
+{
#ifndef DOXYGEN_NO_DETAIL
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/area_by_triangles.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/area_by_triangles.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/area_by_triangles.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -17,9 +17,10 @@
namespace boost { namespace geometry
+{
+namespace strategy { namespace area
{
-namespace strategy { namespace area {
/*!
\brief Strategy functor for area calculation on point_xy points
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/cart_intersect.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/cart_intersect.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/cart_intersect.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -25,11 +25,13 @@
#include <boost/geometry/strategies/side_info.hpp>
+
namespace boost { namespace geometry
{
-namespace strategy { namespace intersection {
+namespace strategy { namespace intersection
+{
#ifndef DOXYGEN_NO_DETAIL
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -27,7 +27,8 @@
// Note: when calling the namespace "centroid", it sometimes,
// somehow, in gcc, gives compilation problems (confusion with function centroid).
-namespace strategy { namespace centroid_ {
+namespace strategy { namespace centroid_
+{
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/distance_projected_point.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/distance_projected_point.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/distance_projected_point.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -32,9 +32,13 @@
// Helper geometry
#include <boost/geometry/geometries/segment.hpp>
-namespace boost { namespace geometry {
-namespace strategy { namespace distance {
+namespace boost { namespace geometry
+{
+
+
+namespace strategy { namespace distance
+{
@@ -162,7 +166,6 @@
};
-
}} // namespace boost::geometry
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/distance_pythagoras.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/distance_pythagoras.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -23,9 +23,11 @@
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
-namespace strategy { namespace distance {
+namespace strategy { namespace distance
+{
#ifndef DOXYGEN_NO_DETAIL
namespace detail
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -14,9 +14,10 @@
namespace boost { namespace geometry
+{
+namespace strategy { namespace within
{
-namespace strategy { namespace within {
/*!
\brief Within detection using cross counting,
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -15,9 +15,10 @@
namespace boost { namespace geometry
+{
+namespace strategy { namespace within
{
-namespace strategy { namespace within {
/*!
\brief Within detection using cross counting
Modified: sandbox/geometry/boost/geometry/strategies/cartesian/side_by_triangle.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/cartesian/side_by_triangle.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/cartesian/side_by_triangle.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,74 +20,72 @@
namespace boost { namespace geometry
{
-namespace strategy
+
+namespace strategy { namespace side
{
- namespace side
- {
- // Check at which side of a segment a point lies:
- // left of segment (> 0), right of segment (< 0), on segment (0)
- // In fact this is twice the area of a triangle
- template <typename CalculationType>
- struct side_by_triangle
- {
-
- // Template member function, because it is not always trivial
- // or convenient to explicitly mention the typenames in the
- // strategy-struct itself.
-
- // Types can be all three different. Therefore it is
- // not implemented (anymore) as "segment"
-
- template <typename P1, typename P2, typename P>
- static inline int apply(P1 const& p1, P2 const& p2, P const& p)
- {
- typedef typename boost::mpl::if_c
+// Check at which side of a segment a point lies:
+// left of segment (> 0), right of segment (< 0), on segment (0)
+// In fact this is twice the area of a triangle
+template <typename CalculationType>
+struct side_by_triangle
+{
+
+ // Template member function, because it is not always trivial
+ // or convenient to explicitly mention the typenames in the
+ // strategy-struct itself.
+
+ // Types can be all three different. Therefore it is
+ // not implemented (anymore) as "segment"
+
+ template <typename P1, typename P2, typename P>
+ static inline int apply(P1 const& p1, P2 const& p2, P const& p)
+ {
+ typedef typename boost::mpl::if_c
+ <
+ boost::is_void<CalculationType>::type::value,
+ typename select_most_precise
<
- boost::is_void<CalculationType>::type::value,
typename select_most_precise
<
- typename select_most_precise
- <
- typename coordinate_type<P1>::type,
- typename coordinate_type<P2>::type
- >::type,
- typename coordinate_type<P>::type
+ typename coordinate_type<P1>::type,
+ typename coordinate_type<P2>::type
>::type,
- CalculationType
- >::type coordinate_type;
+ typename coordinate_type<P>::type
+ >::type,
+ CalculationType
+ >::type coordinate_type;
//std::cout << "side: " << typeid(coordinate_type).name() << std::endl;
- coordinate_type const x = get<0>(p);
- coordinate_type const y = get<1>(p);
-
- coordinate_type const sx1 = get<0>(p1);
- coordinate_type const sy1 = get<1>(p1);
- coordinate_type const sx2 = get<0>(p2);
- coordinate_type const sy2 = get<1>(p2);
+ coordinate_type const x = get<0>(p);
+ coordinate_type const y = get<1>(p);
- // Promote float->double, small int->int
- typedef typename select_most_precise
- <
- coordinate_type,
- double
- >::type promoted_type;
-
- promoted_type const dx = sx2 - sx1;
- promoted_type const dy = sy2 - sy1;
- promoted_type const dpx = x - sx1;
- promoted_type const dpy = y - sy1;
-
- promoted_type const s = dx * dpy - dy * dpx;
-
- promoted_type zero = promoted_type();
- return math::equals(s, zero) ? 0 : s > zero ? 1 : -1;
- //return s > 0 ? 1 : s < 0 ? -1 : 0;
- }
- };
+ coordinate_type const sx1 = get<0>(p1);
+ coordinate_type const sy1 = get<1>(p1);
+ coordinate_type const sx2 = get<0>(p2);
+ coordinate_type const sy2 = get<1>(p2);
+
+ // Promote float->double, small int->int
+ typedef typename select_most_precise
+ <
+ coordinate_type,
+ double
+ >::type promoted_type;
+
+ promoted_type const dx = sx2 - sx1;
+ promoted_type const dy = sy2 - sy1;
+ promoted_type const dpx = x - sx1;
+ promoted_type const dpy = y - sy1;
+
+ promoted_type const s = dx * dpy - dy * dpx;
+
+ promoted_type zero = promoted_type();
+ return math::equals(s, zero) ? 0 : s > zero ? 1 : -1;
+ //return s > 0 ? 1 : s < 0 ? -1 : 0;
+ }
+};
- } // namespace side
-} // namespace strategy
+}} // namespace strategy::side
#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
Modified: sandbox/geometry/boost/geometry/strategies/compare.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/compare.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/compare.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -94,7 +94,8 @@
#endif
-namespace strategy { namespace compare {
+namespace strategy { namespace compare
+{
/*!
@@ -108,7 +109,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail {
+namespace detail
+{
template <typename Type>
struct is_default : boost::false_type
@@ -160,4 +162,5 @@
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_STRATEGIES_COMPARE_HPP
Modified: sandbox/geometry/boost/geometry/strategies/concepts/area_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/concepts/area_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/concepts/area_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -9,11 +9,11 @@
#define BOOST_GEOMETRY_STRATEGIES_CONCEPTS_AREA_CONCEPT_HPP
-
#include <boost/concept_check.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
@@ -63,7 +63,7 @@
};
-
}}} // namespace boost::geometry::concept
+
#endif // BOOST_GEOMETRY_STRATEGIES_CONCEPTS_AREA_CONCEPT_HPP
Modified: sandbox/geometry/boost/geometry/strategies/concepts/centroid_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/concepts/centroid_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/concepts/centroid_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -13,7 +13,8 @@
#include <boost/concept_check.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
@@ -65,7 +66,7 @@
};
-
}}} // namespace boost::geometry::concept
+
#endif // BOOST_GEOMETRY_STRATEGIES_CONCEPTS_CENTROID_CONCEPT_HPP
Modified: sandbox/geometry/boost/geometry/strategies/concepts/convex_hull_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/concepts/convex_hull_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/concepts/convex_hull_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -14,7 +14,8 @@
#include <boost/concept_check.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
@@ -62,7 +63,7 @@
};
-
}}} // namespace boost::geometry::concept
+
#endif // BOOST_GEOMETRY_STRATEGIES_CONCEPTS_CONVEX_HULL_CONCEPT_HPP
Modified: sandbox/geometry/boost/geometry/strategies/concepts/distance_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/concepts/distance_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/concepts/distance_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -17,7 +17,8 @@
#include <boost/geometry/geometries/segment.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
@@ -132,7 +133,7 @@
};
-
}}} // namespace boost::geometry::concept
+
#endif // BOOST_GEOMETRY_STRATEGIES_CONCEPTS_DISTANCE_CONCEPT_HPP
Modified: sandbox/geometry/boost/geometry/strategies/concepts/segment_intersect_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/concepts/segment_intersect_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/concepts/segment_intersect_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -14,7 +14,8 @@
#include <boost/concept_check.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
Modified: sandbox/geometry/boost/geometry/strategies/concepts/simplify_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/concepts/simplify_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/concepts/simplify_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -16,7 +16,8 @@
#include <boost/geometry/strategies/concepts/distance_concept.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
Modified: sandbox/geometry/boost/geometry/strategies/concepts/within_concept.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/concepts/within_concept.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/concepts/within_concept.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -13,7 +13,8 @@
#include <boost/concept_check.hpp>
-namespace boost { namespace geometry { namespace concept {
+namespace boost { namespace geometry { namespace concept
+{
/*!
Modified: sandbox/geometry/boost/geometry/strategies/distance_result.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/distance_result.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/distance_result.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -24,7 +24,8 @@
#include <boost/geometry/util/select_most_precise.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
/*!
\brief Encapsulate the results of distance calculation
Modified: sandbox/geometry/boost/geometry/strategies/spherical/area_huiller.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/spherical/area_huiller.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/spherical/area_huiller.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace area {
+namespace strategy { namespace area
+{
Modified: sandbox/geometry/boost/geometry/strategies/spherical/compare_circular.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/spherical/compare_circular.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/spherical/compare_circular.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -12,12 +12,18 @@
#include <boost/geometry/core/tags.hpp>
#include <boost/geometry/strategies/compare.hpp>
-namespace boost { namespace geometry {
-namespace strategy { namespace compare {
+namespace boost { namespace geometry
+{
+
+
+namespace strategy { namespace compare
+{
+
#ifndef DOXYGEN_NO_DETAIL
-namespace detail {
+namespace detail
+{
template <typename Units>
struct shift
Modified: sandbox/geometry/boost/geometry/strategies/spherical/distance_cross_track.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/spherical/distance_cross_track.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/spherical/distance_cross_track.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -28,7 +28,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace distance {
+namespace strategy { namespace distance
+{
/*!
\brief Strategy functor for distance point to segment calculation
Modified: sandbox/geometry/boost/geometry/strategies/spherical/distance_haversine.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/spherical/distance_haversine.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/spherical/distance_haversine.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -23,7 +23,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace distance {
+namespace strategy { namespace distance
+{
/*!
\brief Distance calculation for spherical coordinates
Modified: sandbox/geometry/boost/geometry/strategies/spherical/side_by_cross_track.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/spherical/side_by_cross_track.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/spherical/side_by_cross_track.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -21,73 +21,72 @@
//#include <boost/geometry/strategies/concepts/side_concept.hpp>
-
namespace boost { namespace geometry
{
-namespace strategy
+
+
+namespace strategy { namespace side
{
- namespace side
- {
- /// Calculate course (bearing) between two points. Might be moved to a "course formula" ...
- template <typename Point>
- static inline double course(Point const& p1, Point const& p2)
- {
- // http://williams.best.vwh.net/avform.htm#Crs
- double dlon = get_as_radian<0>(p2) - get_as_radian<0>(p1);
- double cos_p2lat = cos(get_as_radian<1>(p2));
-
- // "An alternative formula, not requiring the pre-computation of d"
- return atan2(sin(dlon) * cos_p2lat,
- cos(get_as_radian<1>(p1)) * sin(get_as_radian<1>(p2))
- - sin(get_as_radian<1>(p1)) * cos_p2lat * cos(dlon));
- }
+/// Calculate course (bearing) between two points. Might be moved to a "course formula" ...
+template <typename Point>
+static inline double course(Point const& p1, Point const& p2)
+{
+ // http://williams.best.vwh.net/avform.htm#Crs
+ double dlon = get_as_radian<0>(p2) - get_as_radian<0>(p1);
+ double cos_p2lat = cos(get_as_radian<1>(p2));
+
+ // "An alternative formula, not requiring the pre-computation of d"
+ return atan2(sin(dlon) * cos_p2lat,
+ cos(get_as_radian<1>(p1)) * sin(get_as_radian<1>(p2))
+ - sin(get_as_radian<1>(p1)) * cos_p2lat * cos(dlon));
+}
- // Check at which side of a segment a point lies
- // from a Great Circle segment between two points:
- // left of segment (> 0), right of segment (< 0), on segment (0)
- template <typename CalculationType>
- struct side_by_cross_track
- {
-
- // Types can be all three different. Therefore it is
- // not implemented (anymore) as "segment"
-
- template <typename P1, typename P2, typename P>
- static inline int apply(P1 const& p1, P2 const& p2, P const& p)
- {
- typedef typename boost::mpl::if_c
+
+// Check at which side of a segment a point lies
+// from a Great Circle segment between two points:
+// left of segment (> 0), right of segment (< 0), on segment (0)
+template <typename CalculationType>
+struct side_by_cross_track
+{
+
+ // Types can be all three different. Therefore it is
+ // not implemented (anymore) as "segment"
+
+ template <typename P1, typename P2, typename P>
+ static inline int apply(P1 const& p1, P2 const& p2, P const& p)
+ {
+ typedef typename boost::mpl::if_c
+ <
+ boost::is_void<CalculationType>::type::value,
+ typename select_most_precise
<
- boost::is_void<CalculationType>::type::value,
typename select_most_precise
<
- typename select_most_precise
- <
- typename coordinate_type<P1>::type,
- typename coordinate_type<P2>::type
- >::type,
- typename coordinate_type<P>::type
+ typename coordinate_type<P1>::type,
+ typename coordinate_type<P2>::type
>::type,
- CalculationType
- >::type coordinate_type;
-
- // Calculate the distance using the Haversine formula.
- // That is also applicable on the spherical earth. A radius is not necessary.
-
- double d1 = 0.001; // m_strategy.apply(sp1, p);
- double crs_AD = course(p1, p);
- double crs_AB = course(p1, p2);
- double XTD = std::abs(asin(sin(d1) * sin(crs_AD - crs_AB)));
-
- return math::equals(XTD, 0) ? 0 : XTD > 0 ? 1 : -1;
- //return s > 0 ? 1 : s < 0 ? -1 : 0;
- }
- };
+ typename coordinate_type<P>::type
+ >::type,
+ CalculationType
+ >::type coordinate_type;
+
+ // Calculate the distance using the Haversine formula.
+ // That is also applicable on the spherical earth. A radius is not necessary.
+
+ double d1 = 0.001; // m_strategy.apply(sp1, p);
+ double crs_AD = course(p1, p);
+ double crs_AB = course(p1, p2);
+ double XTD = std::abs(asin(sin(d1) * sin(crs_AD - crs_AB)));
+
+ return math::equals(XTD, 0) ? 0 : XTD > 0 ? 1 : -1;
+ //return s > 0 ? 1 : s < 0 ? -1 : 0;
+ }
+};
- } // namespace side
-} // namespace strategy
+}} // namespace strategy::side
#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
Modified: sandbox/geometry/boost/geometry/strategies/strategy_transform.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/strategy_transform.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/strategy_transform.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -26,7 +26,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace transform {
+namespace strategy { namespace transform
+{
#ifndef DOXYGEN_NO_DETAIL
namespace detail
Modified: sandbox/geometry/boost/geometry/strategies/transform/map_transformer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/transform/map_transformer.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/transform/map_transformer.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
namespace boost { namespace geometry
{
-namespace strategy { namespace transform {
+namespace strategy { namespace transform
+{
/*!
\brief Transformation strategy to do map from one to another Cartesian system
@@ -145,8 +146,8 @@
}
};
-}} // namespace strategy::transform
+}} // namespace strategy::transform
}} // namespace boost::geometry
Modified: sandbox/geometry/boost/geometry/strategies/transform/matrix_transformers.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/transform/matrix_transformers.hpp (original)
+++ sandbox/geometry/boost/geometry/strategies/transform/matrix_transformers.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -310,12 +310,14 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail {
+namespace detail
+{
+
template <typename DegreeOrRadian>
struct as_radian
-{
-};
+{};
+
template <>
struct as_radian<radian>
@@ -363,6 +365,7 @@
{}
};
+
} // namespace detail
#endif // DOXYGEN_NO_DETAIL
@@ -398,8 +401,11 @@
{}
};
+
}} // namespace strategy::transform
+
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_STRATEGIES_TRANSFORM_MATRIX_TRANSFORMERS_HPP
Modified: sandbox/geometry/boost/geometry/util/as_range.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/as_range.hpp (original)
+++ sandbox/geometry/boost/geometry/util/as_range.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -20,7 +20,8 @@
#include <boost/geometry/util/add_const_if_c.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DISPATCH
Modified: sandbox/geometry/boost/geometry/util/copy.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/copy.hpp (original)
+++ sandbox/geometry/boost/geometry/util/copy.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -23,7 +23,8 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace copy {
+namespace detail { namespace copy
+{
template <typename Src, typename Dst, std::size_t D, std::size_t N>
struct copy_coordinates
Modified: sandbox/geometry/boost/geometry/util/for_each_range.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/for_each_range.hpp (original)
+++ sandbox/geometry/boost/geometry/util/for_each_range.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -24,7 +24,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace for_each {
+namespace detail { namespace for_each
+{
template <typename Range, typename Actor, bool IsConst>
Modified: sandbox/geometry/boost/geometry/util/get_cs_as_radian.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/get_cs_as_radian.hpp (original)
+++ sandbox/geometry/boost/geometry/util/get_cs_as_radian.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -14,10 +14,12 @@
#include <boost/geometry/core/cs.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail {
+namespace detail
+{
/*!
\brief Small meta-function defining the specified coordinate system,
@@ -42,8 +44,7 @@
#endif
-
-
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_UTIL_GET_CS_AS_RADIAN_HPP
Modified: sandbox/geometry/boost/geometry/util/math.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/math.hpp (original)
+++ sandbox/geometry/boost/geometry/util/math.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -21,7 +21,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace math {
+namespace detail { namespace math
+{
template <typename T, bool Floating>
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -16,7 +16,8 @@
#include <boost/geometry/core/tags.hpp>
-namespace boost { namespace geometry {
+namespace boost { namespace geometry
+{
#ifndef DOXYGEN_NO_DETAIL
Modified: sandbox/geometry/boost/geometry/util/select_most_precise.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/util/select_most_precise.hpp (original)
+++ sandbox/geometry/boost/geometry/util/select_most_precise.hpp 2010-04-23 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -18,7 +18,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace select_most_precise {
+namespace detail { namespace select_most_precise
+{
// At least one of the types is non-fundamental. Take that one.
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 16:53:06 EDT (Fri, 23 Apr 2010)
@@ -26,13 +26,12 @@
#include <boost/geometry/geometries/concepts/check.hpp>
-
-
namespace boost { namespace geometry
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace dsv {
+namespace detail { namespace dsv
+{
struct dsv_settings
@@ -269,7 +268,8 @@
#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch {
+namespace dispatch
+{
template <typename Tag, bool IsMulti, typename Geometry>
struct dsv {};
@@ -315,8 +315,8 @@
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace dsv {
-
+namespace detail { namespace dsv
+{
// FIXME: This class is not copyable/assignable but it is used as such --mloskot
@@ -351,6 +351,7 @@
dsv_settings m_settings;
};
+
}} // namespace detail::dsv
#endif // DOXYGEN_NO_DETAIL
@@ -384,7 +385,7 @@
}
-
}} // namespace boost::geometry
+
#endif // BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
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