boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-12 05:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[index][strategies][test] Modify some of the header includes.

Browse Source 
The purpose of this is to allow the compilation of the rtree without the need of including the geometry.hpp ond require only index/rtree.hpp or to make the order of includes irrelevant.
Furthermore, this is backward compatible.

Add missing variant include in the intersection tests.
Fix the unused typedefs in the pythagoras_point_box test.
This commit is contained in:
Adam Wulkiewicz 2014-06-15 02:29:57 +02:00
parent 264e9676f0
commit b9ff3a7fc4
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/geometry/index/rtree.hpp
View File

@ -12,17 +12,15 @@
#ifndef BOOST_GEOMETRY_INDEX_RTREE_HPP #ifndef BOOST_GEOMETRY_INDEX_RTREE_HPP
#define BOOST_GEOMETRY_INDEX_RTREE_HPP #define BOOST_GEOMETRY_INDEX_RTREE_HPP
// STD
#include <algorithm> #include <algorithm>
// Boost
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/move/move.hpp> #include <boost/move/move.hpp>
//#include <boost/geometry/geometry.hpp> // Boost.Geometry
// START #include <boost/geometry/algorithms/detail/comparable_distance/interface.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/algorithms/comparable_distance.hpp>
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/algorithms/centroid.hpp> #include <boost/geometry/algorithms/centroid.hpp>
#include <boost/geometry/algorithms/covered_by.hpp> #include <boost/geometry/algorithms/covered_by.hpp>
#include <boost/geometry/algorithms/disjoint.hpp> #include <boost/geometry/algorithms/disjoint.hpp>
@ -34,8 +32,10 @@
#include <boost/geometry/geometries/point.hpp> #include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp> #include <boost/geometry/geometries/box.hpp>
// END
#include <boost/geometry/strategies/strategies.hpp>
// Boost.Geometry.Index
#include <boost/geometry/index/detail/config_begin.hpp> #include <boost/geometry/index/detail/config_begin.hpp>
#include <boost/geometry/index/detail/assert.hpp> #include <boost/geometry/index/detail/assert.hpp>
@ -1798,6 +1798,9 @@ inline void swap(rtree<Value, Parameters, IndexableGetter, EqualTo, Allocator> &
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
// TODO: don't include the implementation at the end of the file
#include <boost/geometry/algorithms/detail/comparable_distance/implementation.hpp>
#include <boost/geometry/index/detail/config_end.hpp> #include <boost/geometry/index/detail/config_end.hpp>
#endif // BOOST_GEOMETRY_INDEX_RTREE_HPP #endif // BOOST_GEOMETRY_INDEX_RTREE_HPP

3
include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
View File

@ -13,7 +13,8 @@
#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_WEIGHTED_LENGTH_HPP #ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_WEIGHTED_LENGTH_HPP
#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_WEIGHTED_LENGTH_HPP #define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_WEIGHTED_LENGTH_HPP
#include <boost/geometry/algorithms/distance.hpp> #include <boost/geometry/algorithms/detail/distance/interface.hpp>
#include <boost/geometry/algorithms/detail/distance/point_to_geometry.hpp>
#include <boost/geometry/arithmetic/arithmetic.hpp> #include <boost/geometry/arithmetic/arithmetic.hpp>
#include <boost/geometry/util/select_most_precise.hpp> #include <boost/geometry/util/select_most_precise.hpp>
#include <boost/geometry/strategies/centroid.hpp> #include <boost/geometry/strategies/centroid.hpp>

1
test/algorithms/test_intersection.hpp
View File

@ -14,6 +14,7 @@
#include <boost/core/ignore_unused.hpp> #include <boost/core/ignore_unused.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/variant/variant.hpp>
#include <boost/geometry/algorithms/intersection.hpp> #include <boost/geometry/algorithms/intersection.hpp>
#include <boost/geometry/algorithms/area.hpp> #include <boost/geometry/algorithms/area.hpp>

7
test/strategies/pythagoras_point_box.cpp
View File

@ -27,6 +27,7 @@
# pragma warning( disable : 4101 ) # pragma warning( disable : 4101 )
#endif #endif
#include <boost/core/ignore_unused.hpp>
#include <boost/timer.hpp> #include <boost/timer.hpp>
#include <boost/typeof/typeof.hpp> #include <boost/typeof/typeof.hpp>
@ -184,6 +185,12 @@ inline void test_services()
< <
bg::box_tag, bg::point_tag, Box, Point bg::box_tag, bg::point_tag, Box, Point
>::type reversed_pythagoras_pb_strategy_type; >::type reversed_pythagoras_pb_strategy_type;
boost::ignore_unused
<
pythagoras_pb_strategy_type,
reversed_pythagoras_pb_strategy_type
>();
} }
Point p; Point p;