[Boost-commit] svn:boost r85521 - trunk/libs/geometry/index/test/rtree

Subject: [Boost-commit] svn:boost r85521 - trunk/libs/geometry/index/test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2013-08-29 22:33:26

Author: awulkiew
Date: 2013-08-29 22:33:26 EDT (Thu, 29 Aug 2013)
New Revision: 85521
URL: http://svn.boost.org/trac/boost/changeset/85521

Log:
[geometry][index]test: enabled tests for contains() and covers() predicates.

Text files modified: 
   trunk/libs/geometry/index/test/rtree/test_rtree.hpp |    13 -------------                           
   1 files changed, 0 insertions(+), 13 deletions(-)

Modified: trunk/libs/geometry/index/test/rtree/test_rtree.hpp
==============================================================================
--- trunk/libs/geometry/index/test/rtree/test_rtree.hpp	Thu Aug 29 22:31:31 2013	(r85520)
+++ trunk/libs/geometry/index/test/rtree/test_rtree.hpp	2013-08-29 22:33:26 EDT (Thu, 29 Aug 2013)	(r85521)
@@ -16,9 +16,6 @@
 
 #include <geometry_index_test_common.hpp>
 
-// TEST
-//#define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp>
@@ -734,8 +731,6 @@
     spatial_query(tree, bgi::disjoint(qpoly), expected_output);*/
 }
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Tag>
 struct contains_impl
 {
@@ -778,8 +773,6 @@
     >::apply(tree, input, qbox);
 }
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Rtree, typename Value, typename Box>
 void covered_by(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
 {
@@ -800,8 +793,6 @@
     spatial_query(tree, bgi::covered_by(qpoly), expected_output);*/
 }
 
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Tag>
 struct covers_impl
 {
@@ -844,8 +835,6 @@
     >::apply(tree, input, qbox);
 }
 
-#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
-
 template <typename Tag>
 struct overlaps_impl
 {
@@ -1420,10 +1409,8 @@
     basictest::overlaps(tree, input, qbox);
     //basictest::touches(tree, input, qbox);
     basictest::within(tree, input, qbox);
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
     basictest::contains(tree, input, qbox);
     basictest::covers(tree, input, qbox);
-#endif
 
     typedef typename bg::point_type<Box>::type P;
     P pt;