From fccdc12ee6a3e4b44e8b69b8373da7149367edb2 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Thu, 22 Apr 2010 21:59:06 +0000 Subject: [PATCH] Added missing std:: include files cstddef,vector,deque,map,string [SVN r61493] --- .../detail/buffer/intersecting_inserter.hpp | 3 ++ .../detail/buffer/segmenting_buffer.hpp | 2 ++ .../geometry/algorithms/detail/disjoint.hpp | 1 + .../algorithms/detail/overlay/dissolver.hpp | 3 ++ .../algorithms/detail/overlay/split_rings.hpp | 32 +++++++++---------- .../algorithms/detail/overlay/stream_info.hpp | 3 ++ .../algorithms/detail/point_on_border.hpp | 2 ++ .../boost/geometry/algorithms/disjoint.hpp | 1 + .../boost/geometry/algorithms/dissolve.hpp | 5 ++- .../geometry/algorithms/intersection.hpp | 3 ++ .../boost/geometry/algorithms/intersects.hpp | 2 ++ .../boost/geometry/algorithms/overlaps.hpp | 1 + .../geometry/algorithms/overlay/assemble.hpp | 2 ++ .../algorithms/overlay/copy_segments.hpp | 3 ++ .../geometry/algorithms/overlay/msm_state.hpp | 8 +++++ .../geometry/algorithms/overlay/traverse.hpp | 14 +++++--- .../boost/geometry/algorithms/simplify.hpp | 3 ++ .../geometry/arithmetic/cross_product.hpp | 3 ++ .../boost/geometry/arithmetic/dot_product.hpp | 3 ++ .../boost/geometry/core/reverse_dispatch.hpp | 2 ++ .../adapted/std_pair_as_segment.hpp | 2 ++ .../geometry/geometries/adapted/tuple.hpp | 3 ++ .../geometry/geometries/register/point.hpp | 3 ++ .../geometry/multi/algorithms/dissolve.hpp | 2 ++ .../geometry/multi/core/interior_rings.hpp | 2 ++ .../geometry/multi/core/num_geometries.hpp | 2 ++ include/boost/geometry/policies/compare.hpp | 3 ++ .../geometry/policies/relate/direction.hpp | 6 +++- .../policies/relate/intersection_points.hpp | 2 ++ .../intersection_points_determinant.hpp | 3 ++ .../relate/intersection_points_slope.hpp | 3 ++ .../boost/geometry/policies/relate/tupled.hpp | 9 ++++-- .../agnostic/simplify_douglas_peucker.hpp | 3 ++ .../boost/geometry/strategies/centroid.hpp | 2 ++ .../strategies/intersection_result.hpp | 3 ++ .../strategies/transform/map_transformer.hpp | 2 ++ .../transform/matrix_transformers.hpp | 7 ++-- include/boost/geometry/util/readme.txt | 7 ++++ include/boost/geometry/util/write_dsv.hpp | 2 ++ 39 files changed, 134 insertions(+), 28 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp b/include/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp index e3904bd3f..8bed2ab71 100644 --- a/include/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp @@ -8,6 +8,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_INTERSECTING_INSERTER_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_INTERSECTING_INSERTER_HPP + +#include + #include #include diff --git a/include/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp b/include/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp index 3e03830e4..dd84e8425 100644 --- a/include/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp @@ -8,7 +8,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_SEGMENTING_BUFFER_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_SEGMENTING_BUFFER_HPP + #include +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/disjoint.hpp b/include/boost/geometry/algorithms/detail/disjoint.hpp index c27bfbb6b..58a23af00 100644 --- a/include/boost/geometry/algorithms/detail/disjoint.hpp +++ b/include/boost/geometry/algorithms/detail/disjoint.hpp @@ -13,6 +13,7 @@ // is partly implemented in a separate file, to avoid circular references // disjoint -> get_turns -> disjoint +#include #include #include diff --git a/include/boost/geometry/algorithms/detail/overlay/dissolver.hpp b/include/boost/geometry/algorithms/detail/overlay/dissolver.hpp index 0f8c07083..1820123f5 100644 --- a/include/boost/geometry/algorithms/detail/overlay/dissolver.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/dissolver.hpp @@ -9,6 +9,9 @@ #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DISSOLVER_HPP +#include +#include + #include #include #include diff --git a/include/boost/geometry/algorithms/detail/overlay/split_rings.hpp b/include/boost/geometry/algorithms/detail/overlay/split_rings.hpp index c0536ff16..8e7a94ae3 100644 --- a/include/boost/geometry/algorithms/detail/overlay/split_rings.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/split_rings.hpp @@ -9,7 +9,7 @@ #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_SPLIT_RINGS_HPP -//#include +#include #include @@ -62,7 +62,7 @@ struct split_range --> 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) */ @@ -209,7 +209,7 @@ struct sorter 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; @@ -238,7 +238,7 @@ template struct split_turn_info : detail::overlay::turn_info < P, split_turn_operation

- > + > { //std::string history; int count_between; // counts number of segments between ring in intersection @@ -296,8 +296,8 @@ class range_split_rings std::cout << header << std::endl; BOOST_FOREACH(typename boost::range_value::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 @@ -315,7 +315,7 @@ class range_split_rings return adapt(op, second, first); } if (op.seg_id.segment_index > first.seg_id.segment_index - || + || (op.seg_id.segment_index == first.seg_id.segment_index && op.distance > first.distance ) @@ -358,9 +358,9 @@ class range_split_rings // Make operations[0].seg_id always the smallest, to sort properly // Also calculate the number of segments in between - for (typename boost::range_iterator::type + for (typename boost::range_iterator::type it = boost::begin(turns); - it != boost::end(turns); + it != boost::end(turns); ++it) { turn_info& turn = *it; @@ -380,13 +380,13 @@ class range_split_rings 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()); //report(turns, "sorted"); - + while(turns.size() > 0) { @@ -395,7 +395,7 @@ class range_split_rings split_turn_operation const& first_op = turn.operations[0]; split_turn_operation 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) @@ -435,9 +435,9 @@ class range_split_rings if (do_split) { - for (typename boost::range_iterator::type + for (typename boost::range_iterator::type rest = boost::begin(turns); - rest != boost::end(turns); + rest != boost::end(turns); ++rest) { //turn_info copy = turn; @@ -445,7 +445,7 @@ class range_split_rings || 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; @@ -453,7 +453,7 @@ class range_split_rings } } } - 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)) { diff --git a/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp b/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp index 64847071b..390059b2e 100644 --- a/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp @@ -8,6 +8,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP + +#include + #include diff --git a/include/boost/geometry/algorithms/detail/point_on_border.hpp b/include/boost/geometry/algorithms/detail/point_on_border.hpp index f3e83a94e..67f5ddbcf 100644 --- a/include/boost/geometry/algorithms/detail/point_on_border.hpp +++ b/include/boost/geometry/algorithms/detail/point_on_border.hpp @@ -9,6 +9,8 @@ #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP +#include + #include #include diff --git a/include/boost/geometry/algorithms/disjoint.hpp b/include/boost/geometry/algorithms/disjoint.hpp index 171aedd27..4a531949a 100644 --- a/include/boost/geometry/algorithms/disjoint.hpp +++ b/include/boost/geometry/algorithms/disjoint.hpp @@ -26,6 +26,7 @@ */ +#include #include diff --git a/include/boost/geometry/algorithms/dissolve.hpp b/include/boost/geometry/algorithms/dissolve.hpp index b63a28be9..2a19ed2e5 100644 --- a/include/boost/geometry/algorithms/dissolve.hpp +++ b/include/boost/geometry/algorithms/dissolve.hpp @@ -9,6 +9,9 @@ #define BOOST_GEOMETRY_ALGORITHMS_DISSOLVE_HPP +#include +#include + #include #include @@ -147,7 +150,7 @@ struct dissolve \param output container which will contain dissolved geometry \note Currently dissolve with a (multi)linestring does NOT remove internal overlap, it only tries to connect multiple line end-points. - TODO: we should change this behaviour and add a separate "connect" + TODO: we should change this behaviour and add a separate "connect" algorithm, and let dissolve work like polygon. */ template diff --git a/include/boost/geometry/algorithms/intersection.hpp b/include/boost/geometry/algorithms/intersection.hpp index 97b89f676..1e9c45a74 100644 --- a/include/boost/geometry/algorithms/intersection.hpp +++ b/include/boost/geometry/algorithms/intersection.hpp @@ -10,6 +10,9 @@ #define BOOST_GEOMETRY_ALGORITHMS_INTERSECTION_HPP +#include + + #include #include diff --git a/include/boost/geometry/algorithms/intersects.hpp b/include/boost/geometry/algorithms/intersects.hpp index ce2414ca2..865500e63 100644 --- a/include/boost/geometry/algorithms/intersects.hpp +++ b/include/boost/geometry/algorithms/intersects.hpp @@ -29,6 +29,8 @@ */ +#include + #include diff --git a/include/boost/geometry/algorithms/overlaps.hpp b/include/boost/geometry/algorithms/overlaps.hpp index b1652a4d4..cb2e2ab9e 100644 --- a/include/boost/geometry/algorithms/overlaps.hpp +++ b/include/boost/geometry/algorithms/overlaps.hpp @@ -20,6 +20,7 @@ with the opposite interior faces. */ +#include #include diff --git a/include/boost/geometry/algorithms/overlay/assemble.hpp b/include/boost/geometry/algorithms/overlay/assemble.hpp index e643bce00..ffaa41cb7 100644 --- a/include/boost/geometry/algorithms/overlay/assemble.hpp +++ b/include/boost/geometry/algorithms/overlay/assemble.hpp @@ -8,7 +8,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_ASSEMBLE_HPP #define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_ASSEMBLE_HPP + #include +#include #include #include diff --git a/include/boost/geometry/algorithms/overlay/copy_segments.hpp b/include/boost/geometry/algorithms/overlay/copy_segments.hpp index 9032cfaff..66c6c7d15 100644 --- a/include/boost/geometry/algorithms/overlay/copy_segments.hpp +++ b/include/boost/geometry/algorithms/overlay/copy_segments.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_COPY_SEGMENTS_HPP #define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_COPY_SEGMENTS_HPP + +#include + #include #include diff --git a/include/boost/geometry/algorithms/overlay/msm_state.hpp b/include/boost/geometry/algorithms/overlay/msm_state.hpp index b669bfaf6..7a6f4ac84 100644 --- a/include/boost/geometry/algorithms/overlay/msm_state.hpp +++ b/include/boost/geometry/algorithms/overlay/msm_state.hpp @@ -1,3 +1,11 @@ +// Boost.Geometry (aka GGL, Generic Geometry Library) +// +// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands. +// Use, modification and distribution is subject to the Boost Software License, +// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + + #ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_MSM_STATE_HPP #define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_MSM_STATE_HPP diff --git a/include/boost/geometry/algorithms/overlay/traverse.hpp b/include/boost/geometry/algorithms/overlay/traverse.hpp index 2e68b1937..400a85081 100644 --- a/include/boost/geometry/algorithms/overlay/traverse.hpp +++ b/include/boost/geometry/algorithms/overlay/traverse.hpp @@ -8,6 +8,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_TRAVERSE_HPP #define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_TRAVERSE_HPP + +#include + #include #include @@ -19,6 +22,7 @@ #include #if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT) +#include #include #endif @@ -203,7 +207,7 @@ inline void backtrack(std::size_t size_at_start, bool& fail, #else std::string const& reason, Geometry1 const& , - Geometry2 const& + Geometry2 const& #endif ) { @@ -215,7 +219,7 @@ inline void backtrack(std::size_t size_at_start, bool& fail, // Reject this as a starting point operation.visited.set_rejected(); - + // And clear all visit info clear_visit_info(turns); @@ -231,7 +235,7 @@ inline void backtrack(std::size_t size_at_start, bool& fail, } } } - std::cout << "BACKTRACK (" << reason << " )" + std::cout << "BACKTRACK (" << reason << " )" << " " << c << " of " << turns.size() << " rejected" << std::endl; ***/ @@ -316,7 +320,7 @@ inline void traverse(Geometry1 const& geometry1, operation, *current, current_seg_id, - + current_iit)) { detail::overlay::backtrack( @@ -366,7 +370,7 @@ inline void traverse(Geometry1 const& geometry1, operation, *current, current_seg_id, - + current_iit)) { // Should not occur in valid (non-self-intersecting) polygons diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp index 4f9880e2e..07ed4e3b0 100644 --- a/include/boost/geometry/algorithms/simplify.hpp +++ b/include/boost/geometry/algorithms/simplify.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_SIMPLIFY_HPP #define BOOST_GEOMETRY_ALGORITHMS_SIMPLIFY_HPP + +#include + #include #include diff --git a/include/boost/geometry/arithmetic/cross_product.hpp b/include/boost/geometry/arithmetic/cross_product.hpp index f2dfae3b7..cba2c8627 100644 --- a/include/boost/geometry/arithmetic/cross_product.hpp +++ b/include/boost/geometry/arithmetic/cross_product.hpp @@ -8,6 +8,9 @@ #ifndef BOOST_GEOMETRY_ARITHMETIC_CROSS_PRODUCT_HPP #define BOOST_GEOMETRY_ARITHMETIC_CROSS_PRODUCT_HPP + +#include + #include #include diff --git a/include/boost/geometry/arithmetic/dot_product.hpp b/include/boost/geometry/arithmetic/dot_product.hpp index 49dba46d4..1ca8c2195 100644 --- a/include/boost/geometry/arithmetic/dot_product.hpp +++ b/include/boost/geometry/arithmetic/dot_product.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_ARITHMETIC_DOT_PRODUCT_HPP #define BOOST_GEOMETRY_ARITHMETIC_DOT_PRODUCT_HPP + +#include + #include #include diff --git a/include/boost/geometry/core/reverse_dispatch.hpp b/include/boost/geometry/core/reverse_dispatch.hpp index 27d283f4c..5ac57c4e4 100644 --- a/include/boost/geometry/core/reverse_dispatch.hpp +++ b/include/boost/geometry/core/reverse_dispatch.hpp @@ -11,6 +11,8 @@ #define BOOST_GEOMETRY_CORE_REVERSE_DISPATCH_HPP +#include + #include #include #include diff --git a/include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp b/include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp index ecd2d6457..97f59ca68 100644 --- a/include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp +++ b/include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp @@ -19,6 +19,8 @@ #define BOOST_GEOMETRY_ADAPTED_STD_RANGE_TAG_DEFINED +#include + #include #include diff --git a/include/boost/geometry/geometries/adapted/tuple.hpp b/include/boost/geometry/geometries/adapted/tuple.hpp index cfcdd2b0a..924a521bb 100644 --- a/include/boost/geometry/geometries/adapted/tuple.hpp +++ b/include/boost/geometry/geometries/adapted/tuple.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP #define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP + +#include + #include #include diff --git a/include/boost/geometry/geometries/register/point.hpp b/include/boost/geometry/geometries/register/point.hpp index de65622c4..47e8551a5 100644 --- a/include/boost/geometry/geometries/register/point.hpp +++ b/include/boost/geometry/geometries/register/point.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_GEOMETRIES_REGISTER_POINT_HPP #define BOOST_GEOMETRY_GEOMETRIES_REGISTER_POINT_HPP + +#include + /** * @file point.hpp * @brief Macros for registration of custom point geometry types. diff --git a/include/boost/geometry/multi/algorithms/dissolve.hpp b/include/boost/geometry/multi/algorithms/dissolve.hpp index e40b828cf..29ab641b3 100644 --- a/include/boost/geometry/multi/algorithms/dissolve.hpp +++ b/include/boost/geometry/multi/algorithms/dissolve.hpp @@ -9,6 +9,8 @@ #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DISSOLVE_HPP +#include + #include #include diff --git a/include/boost/geometry/multi/core/interior_rings.hpp b/include/boost/geometry/multi/core/interior_rings.hpp index 44200f29d..d8f50450f 100644 --- a/include/boost/geometry/multi/core/interior_rings.hpp +++ b/include/boost/geometry/multi/core/interior_rings.hpp @@ -10,6 +10,8 @@ #define BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP +#include + #include #include diff --git a/include/boost/geometry/multi/core/num_geometries.hpp b/include/boost/geometry/multi/core/num_geometries.hpp index fcff3263f..0f4170129 100644 --- a/include/boost/geometry/multi/core/num_geometries.hpp +++ b/include/boost/geometry/multi/core/num_geometries.hpp @@ -10,6 +10,8 @@ #define BOOST_GEOMETRY_MULTI_CORE_NUM_GEOMETRIES_HPP +#include + #include #include diff --git a/include/boost/geometry/policies/compare.hpp b/include/boost/geometry/policies/compare.hpp index 9397df16e..f8cebc545 100644 --- a/include/boost/geometry/policies/compare.hpp +++ b/include/boost/geometry/policies/compare.hpp @@ -43,6 +43,9 @@ a free function operating on different point types or even different geometry types (a linestring can be spatially equal to a multi-linestring). */ + +#include + #include #include diff --git a/include/boost/geometry/policies/relate/direction.hpp b/include/boost/geometry/policies/relate/direction.hpp index 03cd04d85..60bd7d3e8 100644 --- a/include/boost/geometry/policies/relate/direction.hpp +++ b/include/boost/geometry/policies/relate/direction.hpp @@ -9,6 +9,10 @@ #ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_DIRECTION_HPP #define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_DIRECTION_HPP + +#include +#include + #include #include @@ -175,7 +179,7 @@ struct segments_direction } template - static inline return_type collinear_interior_boundary_intersect(S const& , bool, + static inline return_type collinear_interior_boundary_intersect(S const& , bool, int arrival_a, int arrival_b, bool opposite) { return_type r('c', opposite); diff --git a/include/boost/geometry/policies/relate/intersection_points.hpp b/include/boost/geometry/policies/relate/intersection_points.hpp index 1e92b3dc4..162cbf078 100644 --- a/include/boost/geometry/policies/relate/intersection_points.hpp +++ b/include/boost/geometry/policies/relate/intersection_points.hpp @@ -9,7 +9,9 @@ #ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP #define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP + #include +#include #include #include diff --git a/include/boost/geometry/policies/relate/intersection_points_determinant.hpp b/include/boost/geometry/policies/relate/intersection_points_determinant.hpp index 80cdced14..66b3201bc 100644 --- a/include/boost/geometry/policies/relate/intersection_points_determinant.hpp +++ b/include/boost/geometry/policies/relate/intersection_points_determinant.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP #define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP + +#include + #include #include diff --git a/include/boost/geometry/policies/relate/intersection_points_slope.hpp b/include/boost/geometry/policies/relate/intersection_points_slope.hpp index 49430beb0..4d9d39f29 100644 --- a/include/boost/geometry/policies/relate/intersection_points_slope.hpp +++ b/include/boost/geometry/policies/relate/intersection_points_slope.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP #define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP + +#include + #include #include diff --git a/include/boost/geometry/policies/relate/tupled.hpp b/include/boost/geometry/policies/relate/tupled.hpp index 26a401c0e..d742abb6a 100644 --- a/include/boost/geometry/policies/relate/tupled.hpp +++ b/include/boost/geometry/policies/relate/tupled.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_TUPLED_HPP #define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_TUPLED_HPP + +#include + #include #include #include @@ -52,9 +55,9 @@ struct segments_tupled { return boost::make_tuple ( - Policy1::segments_intersect(sides, + Policy1::segments_intersect(sides, dx1, dy1, dx2, dy2, s1, s2), - Policy2::segments_intersect(sides, + Policy2::segments_intersect(sides, dx1, dy1, dx2, dy2, s1, s2) ); } @@ -71,7 +74,7 @@ struct segments_tupled template static inline return_type collinear_interior_boundary_intersect(S const& segment, - bool a_within_b, + bool a_within_b, int arrival_a, int arrival_b, bool opposite) { return boost::make_tuple diff --git a/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp b/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp index 9910bf66d..32d864b98 100644 --- a/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp +++ b/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp @@ -9,7 +9,10 @@ #ifndef BOOST_GEOMETRY_STRATEGY_AGNOSTIC_SIMPLIFY_DOUGLAS_PEUCKER_HPP #define BOOST_GEOMETRY_STRATEGY_AGNOSTIC_SIMPLIFY_DOUGLAS_PEUCKER_HPP + +#include #include + #include #include diff --git a/include/boost/geometry/strategies/centroid.hpp b/include/boost/geometry/strategies/centroid.hpp index 20c246fde..5c4396074 100644 --- a/include/boost/geometry/strategies/centroid.hpp +++ b/include/boost/geometry/strategies/centroid.hpp @@ -10,6 +10,8 @@ #define BOOST_GEOMETRY_STRATEGIES_CENTROID_HPP +#include + #include diff --git a/include/boost/geometry/strategies/intersection_result.hpp b/include/boost/geometry/strategies/intersection_result.hpp index 382ee6a42..c5be4e55e 100644 --- a/include/boost/geometry/strategies/intersection_result.hpp +++ b/include/boost/geometry/strategies/intersection_result.hpp @@ -13,6 +13,9 @@ #include #endif +#include + + namespace boost { namespace geometry { diff --git a/include/boost/geometry/strategies/transform/map_transformer.hpp b/include/boost/geometry/strategies/transform/map_transformer.hpp index faff52a69..1ba9ee894 100644 --- a/include/boost/geometry/strategies/transform/map_transformer.hpp +++ b/include/boost/geometry/strategies/transform/map_transformer.hpp @@ -10,6 +10,8 @@ #define BOOST_GEOMETRY_STRATEGIES_TRANSFORM_MAP_TRANSFORMER_HPP +#include + #include diff --git a/include/boost/geometry/strategies/transform/matrix_transformers.hpp b/include/boost/geometry/strategies/transform/matrix_transformers.hpp index ca86453bd..9c79a09b4 100644 --- a/include/boost/geometry/strategies/transform/matrix_transformers.hpp +++ b/include/boost/geometry/strategies/transform/matrix_transformers.hpp @@ -9,6 +9,9 @@ #ifndef BOOST_GEOMETRY_STRATEGIES_TRANSFORM_MATRIX_TRANSFORMERS_HPP #define BOOST_GEOMETRY_STRATEGIES_TRANSFORM_MATRIX_TRANSFORMERS_HPP + +#include + // Remove the ublas checking, otherwise the inverse might fail // (while nothing seems to be wrong) #define BOOST_UBLAS_TYPE_CHECK 0 @@ -25,10 +28,10 @@ #include -namespace boost { namespace geometry +namespace boost { namespace geometry { -namespace strategy { namespace transform +namespace strategy { namespace transform { /*! diff --git a/include/boost/geometry/util/readme.txt b/include/boost/geometry/util/readme.txt index d683ec09e..4bef0ba6d 100644 --- a/include/boost/geometry/util/readme.txt +++ b/include/boost/geometry/util/readme.txt @@ -1,3 +1,10 @@ +// Boost.Geometry (aka GGL, Generic Geometry Library) +// +// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands. +// Use, modification and distribution is subject to the Boost Software License, +// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + This folder contains several headerfiles not fitting in one of the other folders, or meta-functions which would fit into boost as a separate trait or utility, such as add_const_if_c diff --git a/include/boost/geometry/util/write_dsv.hpp b/include/boost/geometry/util/write_dsv.hpp index 59333478d..86c504e25 100644 --- a/include/boost/geometry/util/write_dsv.hpp +++ b/include/boost/geometry/util/write_dsv.hpp @@ -8,6 +8,8 @@ #ifndef BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP #define BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP + +#include #include #include