boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-12 00:02:09 +00:00
Code Issues Projects Releases Wiki Activity

Added missing std:: include files cstddef,vector,deque,map,string

Browse Source 
[SVN r61493]
This commit is contained in:
Barend Gehrels
2010-04-22 21:59:06 +00:00
parent 7bd58d04a6
commit fccdc12ee6
39 changed files with 134 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp
View File

@@ -8,6 +8,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_INTERSECTING_INSERTER_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_INTERSECTING_INSERTER_HPP
#include <cstddef>
#include <boost/range/functions.hpp>
#include <boost/range/metafunctions.hpp>

2
include/boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp
View File

@@ -8,7 +8,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_SEGMENTING_BUFFER_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_SEGMENTING_BUFFER_HPP
#include <cstddef>
#include <vector>
#include <boost/foreach.hpp>
#include <boost/numeric/conversion/cast.hpp>

1
include/boost/geometry/algorithms/detail/disjoint.hpp
View File

@@ -13,6 +13,7 @@
// is partly implemented in a separate file, to avoid circular references
// disjoint -> get_turns -> disjoint
#include <cstddef>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>

3
include/boost/geometry/algorithms/detail/overlay/dissolver.hpp
View File

@@ -9,6 +9,9 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DISSOLVER_HPP
#include <deque>
#include <vector>
#include <boost/geometry/core/tag.hpp>
#include <boost/geometry/core/tags.hpp>
#include <boost/geometry/core/point_type.hpp>

32
include/boost/geometry/algorithms/detail/overlay/split_rings.hpp
View File

@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_SPLIT_RINGS_HPP
//#include <boost/foreach.hpp>
#include <deque>
#include <boost/geometry/algorithms/overlay/get_turns.hpp>
@@ -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 <typename P>
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
@@ -296,8 +296,8 @@ class range_split_rings
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
@@ -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<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;
@@ -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<turn_info>());
//report(turns, "sorted");
while(turns.size() > 0)
{
@@ -395,7 +395,7 @@ class range_split_rings
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)
@@ -435,9 +435,9 @@ class range_split_rings
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;
@@ -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))
{

3
include/boost/geometry/algorithms/detail/overlay/stream_info.hpp
View File

@@ -8,6 +8,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP
#include <string>
#include <boost/array.hpp>

2
include/boost/geometry/algorithms/detail/point_on_border.hpp
View File

@@ -9,6 +9,8 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
#include <cstddef>
#include <boost/range/functions.hpp>
#include <boost/geometry/core/point_type.hpp>

1
include/boost/geometry/algorithms/disjoint.hpp
View File

@@ -26,6 +26,7 @@
*/
#include <cstddef>
#include <deque>

5
include/boost/geometry/algorithms/dissolve.hpp
View File

@@ -9,6 +9,9 @@
#define BOOST_GEOMETRY_ALGORITHMS_DISSOLVE_HPP
#include <map>
#include <vector>
#include <boost/geometry/algorithms/overlay/get_turns.hpp>
#include <boost/geometry/algorithms/overlay/self_turn_points.hpp>
@@ -147,7 +150,7 @@ struct dissolve<ring_tag, ring_tag, Ring, RingOut>
\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

3
include/boost/geometry/algorithms/intersection.hpp
View File

@@ -10,6 +10,9 @@
#define BOOST_GEOMETRY_ALGORITHMS_INTERSECTION_HPP
#include <cstddef>
#include <boost/mpl/if.hpp>
#include <boost/geometry/core/reverse_dispatch.hpp>

2
include/boost/geometry/algorithms/intersects.hpp
View File

@@ -29,6 +29,8 @@
*/
#include <deque>
#include <boost/geometry/geometries/concepts/check.hpp>

1
include/boost/geometry/algorithms/overlaps.hpp
View File

@@ -20,6 +20,7 @@ with the opposite interior faces.
*/
#include <cstddef>
#include <boost/geometry/core/access.hpp>

2
include/boost/geometry/algorithms/overlay/assemble.hpp
View File

@@ -8,7 +8,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_ASSEMBLE_HPP
#define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_ASSEMBLE_HPP
#include <deque>
#include <map>
#include <vector>
#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>

3
include/boost/geometry/algorithms/overlay/copy_segments.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_COPY_SEGMENTS_HPP
#define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_COPY_SEGMENTS_HPP
#include <vector>
#include <boost/assert.hpp>
#include <boost/geometry/core/tags.hpp>

8
include/boost/geometry/algorithms/overlay/msm_state.hpp
View File

@@ -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

14
include/boost/geometry/algorithms/overlay/traverse.hpp
View File

@@ -8,6 +8,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAY_TRAVERSE_HPP
#define BOOST_GEOMETRY_ALGORITHMS_OVERLAY_TRAVERSE_HPP
#include <cstddef>
#include <boost/range/functions.hpp>
#include <boost/range/metafunctions.hpp>
@@ -19,6 +22,7 @@
#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>
#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

3
include/boost/geometry/algorithms/simplify.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_ALGORITHMS_SIMPLIFY_HPP
#define BOOST_GEOMETRY_ALGORITHMS_SIMPLIFY_HPP
#include <cstddef>
#include <boost/range/functions.hpp>
#include <boost/range/metafunctions.hpp>

3
include/boost/geometry/arithmetic/cross_product.hpp
View File

@@ -8,6 +8,9 @@
#ifndef BOOST_GEOMETRY_ARITHMETIC_CROSS_PRODUCT_HPP
#define BOOST_GEOMETRY_ARITHMETIC_CROSS_PRODUCT_HPP
#include <cstddef>
#include <boost/concept/requires.hpp>
#include <boost/geometry/core/access.hpp>

3
include/boost/geometry/arithmetic/dot_product.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_ARITHMETIC_DOT_PRODUCT_HPP
#define BOOST_GEOMETRY_ARITHMETIC_DOT_PRODUCT_HPP
#include <cstddef>
#include <boost/concept/requires.hpp>
#include <boost/geometry/geometries/concepts/point_concept.hpp>

2
include/boost/geometry/core/reverse_dispatch.hpp
View File

@@ -11,6 +11,8 @@
#define BOOST_GEOMETRY_CORE_REVERSE_DISPATCH_HPP
#include <cstddef>
#include <boost/type_traits.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/greater.hpp>

2
include/boost/geometry/geometries/adapted/std_pair_as_segment.hpp
View File

@@ -19,6 +19,8 @@
#define BOOST_GEOMETRY_ADAPTED_STD_RANGE_TAG_DEFINED
#include <cstddef>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/tag.hpp>

3
include/boost/geometry/geometries/adapted/tuple.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP
#define BOOST_GEOMETRY_GEOMETRIES_ADAPTED_TUPLE_HPP
#include <cstddef>
#include <boost/tuple/tuple.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>

3
include/boost/geometry/geometries/register/point.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_GEOMETRIES_REGISTER_POINT_HPP
#define BOOST_GEOMETRY_GEOMETRIES_REGISTER_POINT_HPP
#include <cstddef>
/**
* @file point.hpp
* @brief Macros for registration of custom point geometry types.

2
include/boost/geometry/multi/algorithms/dissolve.hpp
View File

@@ -9,6 +9,8 @@
#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DISSOLVE_HPP
#include <vector>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/core/point_type.hpp>

2
include/boost/geometry/multi/core/interior_rings.hpp
View File

@@ -10,6 +10,8 @@
#define BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP
#include <cstddef>
#include <boost/range/functions.hpp>
#include <boost/range/metafunctions.hpp>

2
include/boost/geometry/multi/core/num_geometries.hpp
View File

@@ -10,6 +10,8 @@
#define BOOST_GEOMETRY_MULTI_CORE_NUM_GEOMETRIES_HPP
#include <cstddef>
#include <boost/range/functions.hpp>
#include <boost/range/metafunctions.hpp>

3
include/boost/geometry/policies/compare.hpp
View File

@@ -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 <cstddef>
#include <boost/geometry/strategies/compare.hpp>
#include <boost/geometry/util/math.hpp>

6
include/boost/geometry/policies/relate/direction.hpp
View File

@@ -9,6 +9,10 @@
#ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_DIRECTION_HPP
#define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_DIRECTION_HPP
#include <cstddef>
#include <string>
#include <boost/concept_check.hpp>
#include <boost/geometry/strategies/side_info.hpp>
@@ -175,7 +179,7 @@ struct segments_direction
}
template <typename S>
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);

2
include/boost/geometry/policies/relate/intersection_points.hpp
View File

@@ -9,7 +9,9 @@
#ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP
#define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP
#include <algorithm>
#include <string>
#include <boost/concept_check.hpp>
#include <boost/numeric/conversion/cast.hpp>

3
include/boost/geometry/policies/relate/intersection_points_determinant.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP
#define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP
#include <string>
#include <boost/concept_check.hpp>
#include <boost/numeric/conversion/cast.hpp>

3
include/boost/geometry/policies/relate/intersection_points_slope.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP
#define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_POINTS_HPP
#include <string>
#include <boost/concept_check.hpp>
#include <boost/numeric/conversion/cast.hpp>

9
include/boost/geometry/policies/relate/tupled.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_TUPLED_HPP
#define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_TUPLED_HPP
#include <string>
#include <boost/tuple/tuple.hpp>
#include <boost/geometry/strategies/side_info.hpp>
#include <boost/geometry/util/select_calculation_type.hpp>
@@ -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 <typename S>
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

3
include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
View File

@@ -9,7 +9,10 @@
#ifndef BOOST_GEOMETRY_STRATEGY_AGNOSTIC_SIMPLIFY_DOUGLAS_PEUCKER_HPP
#define BOOST_GEOMETRY_STRATEGY_AGNOSTIC_SIMPLIFY_DOUGLAS_PEUCKER_HPP
#include <cstddef>
#include <vector>
#include <boost/range/functions.hpp>
#include <boost/geometry/core/cs.hpp>

2
include/boost/geometry/strategies/centroid.hpp
View File

@@ -10,6 +10,8 @@
#define BOOST_GEOMETRY_STRATEGIES_CENTROID_HPP
#include <cstddef>
#include <boost/geometry/strategies/tags.hpp>

3
include/boost/geometry/strategies/intersection_result.hpp
View File

@@ -13,6 +13,9 @@
#include <string>
#endif
#include <cstddef>
namespace boost { namespace geometry
{

2
include/boost/geometry/strategies/transform/map_transformer.hpp
View File

@@ -10,6 +10,8 @@
#define BOOST_GEOMETRY_STRATEGIES_TRANSFORM_MAP_TRANSFORMER_HPP
#include <cstddef>
#include <boost/geometry/strategies/transform/matrix_transformers.hpp>

7
include/boost/geometry/strategies/transform/matrix_transformers.hpp
View File

@@ -9,6 +9,9 @@
#ifndef BOOST_GEOMETRY_STRATEGIES_TRANSFORM_MATRIX_TRANSFORMERS_HPP
#define BOOST_GEOMETRY_STRATEGIES_TRANSFORM_MATRIX_TRANSFORMERS_HPP
#include <cstddef>
// 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 <boost/geometry/util/select_most_precise.hpp>
namespace boost { namespace geometry
namespace boost { namespace geometry
{
namespace strategy { namespace transform
namespace strategy { namespace transform
{
/*!

7
include/boost/geometry/util/readme.txt
View File

@@ -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

2
include/boost/geometry/util/write_dsv.hpp
View File

@@ -8,6 +8,8 @@
#ifndef BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
#define BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
#include <cstddef>
#include <ostream>
#include <string>