Skip to content

Commit 3f5c044

Browse files
committed
[fix] include of boost range size
1 parent 96ba473 commit 3f5c044

31 files changed

+46
-6
lines changed

Diff for: include/boost/geometry/algorithms/correct_closure.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <boost/geometry/geometries/concepts/check.hpp>
2727

2828
#include <boost/geometry/util/range.hpp>
29+
#include <boost/range/size.hpp>
2930

3031
namespace boost { namespace geometry
3132
{

Diff for: include/boost/geometry/algorithms/detail/buffer/piece_border.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <array>
1919

2020
#include <boost/core/addressof.hpp>
21+
#include <boost/range/size.hpp>
2122

2223
#include <boost/geometry/core/assert.hpp>
2324
#include <boost/geometry/core/config.hpp>

Diff for: include/boost/geometry/algorithms/detail/buffer/turn_in_original_visitor.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717

1818
#include <boost/core/ignore_unused.hpp>
19-
#include <boost/geometry/core/coordinate_type.hpp>
19+
#include <boost/range/size.hpp>
2020

21+
#include <boost/geometry/core/coordinate_type.hpp>
2122
#include <boost/geometry/algorithms/detail/buffer/buffer_policies.hpp>
2223
#include <boost/geometry/algorithms/detail/disjoint/interface.hpp>
2324
#include <boost/geometry/algorithms/expand.hpp>

Diff for: include/boost/geometry/algorithms/detail/calculate_point_order.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#include <vector>
1616

17+
#include <boost/range/size.hpp>
18+
1719
#include <boost/geometry/algorithms/area.hpp>
1820
#include <boost/geometry/core/point_order.hpp>
1921
#include <boost/geometry/core/radian_access.hpp>

Diff for: include/boost/geometry/algorithms/detail/closest_feature/point_to_range.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#include <boost/range/begin.hpp>
1616
#include <boost/range/end.hpp>
17-
#include <boost/range/size.hpp>
1817

1918
#include <boost/geometry/core/assert.hpp>
2019
#include <boost/geometry/core/closure.hpp>

Diff for: include/boost/geometry/algorithms/detail/closest_points/multipoint_to_geometry.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include <iterator>
1414

15+
#include <boost/range/size.hpp>
16+
1517
#include <boost/geometry/algorithms/covered_by.hpp>
1618
#include <boost/geometry/algorithms/detail/closest_points/range_to_geometry_rtree.hpp>
1719
#include <boost/geometry/algorithms/detail/closest_points/utilities.hpp>

Diff for: include/boost/geometry/algorithms/detail/convex_hull/graham_andrew.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <algorithm>
2424
#include <vector>
2525

26+
#include <boost/range/size.hpp>
27+
2628
#include <boost/geometry/algorithms/detail/for_each_range.hpp>
2729
#include <boost/geometry/core/assert.hpp>
2830
#include <boost/geometry/core/closure.hpp>

Diff for: include/boost/geometry/algorithms/detail/convex_hull/interface.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
#include <array>
2626

27+
#include <boost/range/size.hpp>
28+
2729
#include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
2830
#include <boost/geometry/algorithms/detail/convex_hull/graham_andrew.hpp>
2931
#include <boost/geometry/algorithms/detail/equals/point_point.hpp>

Diff for: include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_SEGMENT_OR_BOX_HPP
2323

2424

25+
#include <boost/range/size.hpp>
26+
2527
#include <boost/geometry/algorithms/detail/disjoint/multirange_geometry.hpp>
2628
#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
2729
#include <boost/geometry/algorithms/not_implemented.hpp>

Diff for: include/boost/geometry/algorithms/detail/distance/geometry_collection.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include <vector>
1414

15+
#include <boost/range/size.hpp>
16+
1517
#include <boost/geometry/algorithms/dispatch/distance.hpp>
1618
#include <boost/geometry/algorithms/detail/visit.hpp>
1719
#include <boost/geometry/core/assert.hpp>

Diff for: include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222

2323
#include <boost/numeric/conversion/cast.hpp>
24+
#include <boost/range/size.hpp>
2425

2526
#include <boost/geometry/algorithms/detail/normalize.hpp>
2627
#include <boost/geometry/algorithms/not_implemented.hpp>

Diff for: include/boost/geometry/algorithms/detail/intersection/gc.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include <tuple>
1414

15+
#include <boost/range/size.hpp>
16+
1517
#include <boost/geometry/algorithms/detail/gc_make_rtree.hpp>
1618
#include <boost/geometry/algorithms/detail/intersection/interface.hpp>
1719
#include <boost/geometry/views/detail/geometry_collection_view.hpp>

Diff for: include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <boost/iterator/filter_iterator.hpp>
2121
#include <boost/range/begin.hpp>
2222
#include <boost/range/end.hpp>
23-
#include <boost/range/size.hpp>
2423
#include <boost/range/value_type.hpp>
2524

2625
#include <boost/geometry/core/exterior_ring.hpp>

Diff for: include/boost/geometry/algorithms/detail/is_valid/ring.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
#include <deque>
1717

18+
#include <boost/range/size.hpp>
19+
1820
#include <boost/core/ignore_unused.hpp>
1921

2022
#include <boost/geometry/core/closure.hpp>
@@ -38,12 +40,11 @@
3840
#include <boost/geometry/algorithms/detail/is_valid/has_valid_self_turns.hpp>
3941
#include <boost/geometry/algorithms/dispatch/is_valid.hpp>
4042

41-
// TEMP - with UmberllaStrategy this will be not needed
43+
// TEMP - with UmbrellaStrategy this will be not needed
4244
#include <boost/geometry/strategy/area.hpp>
4345
#include <boost/geometry/strategies/area/services.hpp>
4446
// TODO: use point_order instead of area
4547

46-
4748
#ifdef BOOST_GEOMETRY_TEST_DEBUG
4849
#include <boost/geometry/io/dsv/write.hpp>
4950
#endif

Diff for: include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <cstddef>
1717

1818
#include <boost/range/value_type.hpp>
19+
#include <boost/range/size.hpp>
1920

2021
#include <boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp>
2122
#include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>

Diff for: include/boost/geometry/algorithms/detail/overlay/traverse.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
#include <cstddef>
1313

14+
#include <boost/range/size.hpp>
15+
1416
#include <boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp>
1517
#include <boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp>
1618
#include <boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp>

Diff for: include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_BOUNDARY_CHECKER_HPP
1414

1515
#include <boost/core/ignore_unused.hpp>
16+
#include <boost/range/size.hpp>
1617

1718
#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
1819
#include <boost/geometry/algorithms/detail/sub_range.hpp>

Diff for: include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <vector>
1919

2020
#include <boost/core/ignore_unused.hpp>
21+
#include <boost/range/size.hpp>
2122

2223
#include <boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp>
2324
#include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>

Diff for: include/boost/geometry/algorithms/detail/relate/point_point.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <vector>
2020

2121
#include <boost/range/empty.hpp>
22+
#include <boost/range/size.hpp>
2223

2324
#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
2425
#include <boost/geometry/algorithms/detail/within/point_in_geometry.hpp>

Diff for: include/boost/geometry/algorithms/detail/relate/topology_check.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TOPOLOGY_CHECK_HPP
1313
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TOPOLOGY_CHECK_HPP
1414

15+
#include <boost/range/size.hpp>
1516

1617
#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
1718
#include <boost/geometry/algorithms/not_implemented.hpp>

Diff for: include/boost/geometry/algorithms/discrete_frechet_distance.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
#include <vector>
2424

25+
#include <boost/range/size.hpp>
26+
2527
#include <boost/geometry/algorithms/detail/dummy_geometries.hpp>
2628
#include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
2729
#include <boost/geometry/algorithms/not_implemented.hpp>

Diff for: include/boost/geometry/algorithms/discrete_hausdorff_distance.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include <vector>
2727
#include <limits>
2828

29+
#include <boost/range/size.hpp>
30+
2931
#include <boost/geometry/algorithms/detail/dummy_geometries.hpp>
3032
#include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
3133
#include <boost/geometry/algorithms/not_implemented.hpp>

Diff for: include/boost/geometry/algorithms/is_convex.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717

1818
#include <boost/range/empty.hpp>
19+
#include <boost/range/size.hpp>
1920

2021
#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
2122
#include <boost/geometry/algorithms/detail/dummy_geometries.hpp>

Diff for: include/boost/geometry/index/detail/algorithms/path_intersection.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
#include <boost/geometry/strategies/default_distance_result.hpp>
2828
#include <boost/geometry/strategies/default_length_result.hpp>
2929

30+
#include <boost/range/begin.hpp>
31+
#include <boost/range/end.hpp>
32+
#include <boost/range/size.hpp>
33+
#include <boost/range/value_type.hpp>
3034

3135
namespace boost { namespace geometry { namespace index { namespace detail {
3236

Diff for: include/boost/geometry/io/dsv/write.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <boost/range/begin.hpp>
2828
#include <boost/range/end.hpp>
2929
#include <boost/range/value_type.hpp>
30+
#include <boost/range/size.hpp>
3031

3132
#include <boost/geometry/core/exterior_ring.hpp>
3233
#include <boost/geometry/core/interior_rings.hpp>

Diff for: include/boost/geometry/srs/projection.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <string>
2020
#include <type_traits>
2121

22+
#include <boost/range/size.hpp>
2223
#include <boost/throw_exception.hpp>
2324

2425
#include <boost/geometry/algorithms/convert.hpp>

Diff for: include/boost/geometry/srs/transformation.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <string>
1515
#include <type_traits>
1616

17+
#include <boost/range/size.hpp>
1718
#include <boost/throw_exception.hpp>
1819

1920
#include <boost/geometry/algorithms/convert.hpp>

Diff for: include/boost/geometry/strategy/spherical/envelope_range.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#ifndef BOOST_GEOMETRY_STRATEGY_SPHERICAL_ENVELOPE_RANGE_HPP
1111
#define BOOST_GEOMETRY_STRATEGY_SPHERICAL_ENVELOPE_RANGE_HPP
1212

13+
#include <boost/range/size.hpp>
14+
1315
#include <boost/geometry/algorithms/assign.hpp>
1416
#include <boost/geometry/algorithms/detail/envelope/initialize.hpp>
1517
#include <boost/geometry/geometries/segment.hpp>

Diff for: include/boost/geometry/views/detail/boundary_view/implementation.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <boost/core/addressof.hpp>
2424
#include <boost/iterator/iterator_facade.hpp>
2525
#include <boost/iterator/iterator_categories.hpp>
26+
#include <boost/range/size.hpp>
2627

2728
#include <boost/geometry/algorithms/num_interior_rings.hpp>
2829
#include <boost/geometry/core/assert.hpp>

Diff for: index/test/algorithms/path_intersection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <boost/geometry/geometries/linestring.hpp>
1818
#include <boost/geometry/geometries/segment.hpp>
1919

20-
//#include <boost/geometry/io/wkt/read.hpp>
20+
#include <boost/range/size.hpp>
2121

2222
template <typename Box, typename Linestring>
2323
void test_path_intersection(Box const& box, Linestring const& path,

Diff for: test/algorithms/set_operations/union/test_union.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <boost/range/begin.hpp>
2929
#include <boost/range/end.hpp>
3030
#include <boost/range/iterator.hpp>
31+
#include <boost/range/size.hpp>
3132

3233
#include <boost/geometry/algorithms/union.hpp>
3334

0 commit comments

Comments
 (0)