[Boost-commit] svn:boost r83290 - sandbox-branches/geometry/index/test/rtree

Subject: [Boost-commit] svn:boost r83290 - sandbox-branches/geometry/index/test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2013-03-03 20:13:06

Author: awulkiew
Date: 2013-03-03 20:13:05 EST (Sun, 03 Mar 2013)
New Revision: 83290
URL: http://svn.boost.org/trac/boost/changeset/83290

Log:
rtree: errors in test fixed
Text files modified: 
   sandbox-branches/geometry/index/test/rtree/test_rtree.hpp |    16 ++++++++--------                        
   1 files changed, 8 insertions(+), 8 deletions(-)

Modified: sandbox-branches/geometry/index/test/rtree/test_rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index/test/rtree/test_rtree.hpp	(original)
+++ sandbox-branches/geometry/index/test/rtree/test_rtree.hpp	2013-03-03 20:13:05 EST (Sun, 03 Mar 2013)
@@ -899,7 +899,7 @@
     t1.query(bgi::intersects(qbox), std::back_inserter(output));
     test_exactly_the_same_outputs(t1, output, expected_output);
 
-    Rtree t2(tree, tree.get_allocator());
+    Rtree t2(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
     t2.swap(t1);
     BOOST_CHECK(tree.empty() == t2.empty());
     BOOST_CHECK(tree.size() == t2.size());
@@ -947,7 +947,7 @@
     tree.query(bgi::intersects(qbox), std::back_inserter(expected_output));
 
     {
-        Rtree t(tree, tree.get_allocator());
+        Rtree t(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
         BOOST_FOREACH(Value const& v, input)
             t.insert(v);
         BOOST_CHECK(tree.size() == t.size());
@@ -956,7 +956,7 @@
         test_exactly_the_same_outputs(t, output, expected_output);
     }
     {
-        Rtree t(tree, tree.get_allocator());
+        Rtree t(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
         std::copy(input.begin(), input.end(), bgi::inserter(t));
         BOOST_CHECK(tree.size() == t.size());
         std::vector<Value> output;
@@ -978,7 +978,7 @@
         test_exactly_the_same_outputs(t, output, expected_output);
     }
     {
-        Rtree t(tree, tree.get_allocator());
+        Rtree t(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
         t.insert(input.begin(), input.end());
         BOOST_CHECK(tree.size() == t.size());
         std::vector<Value> output;
@@ -986,7 +986,7 @@
         test_exactly_the_same_outputs(t, output, expected_output);
     }
     {
-        Rtree t(tree, tree.get_allocator());
+        Rtree t(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
         t.insert(input);
         BOOST_CHECK(tree.size() == t.size());
         std::vector<Value> output;
@@ -995,7 +995,7 @@
     }
 
     {
-        Rtree t(tree, tree.get_allocator());
+        Rtree t(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
         BOOST_FOREACH(Value const& v, input)
             bgi::insert(t, v);
         BOOST_CHECK(tree.size() == t.size());
@@ -1004,7 +1004,7 @@
         test_exactly_the_same_outputs(t, output, expected_output);
     }
     {
-        Rtree t(tree, tree.get_allocator());
+        Rtree t(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
         bgi::insert(t, input.begin(), input.end());
         BOOST_CHECK(tree.size() == t.size());
         std::vector<Value> output;
@@ -1012,7 +1012,7 @@
         test_exactly_the_same_outputs(t, output, expected_output);
     }
     {
-        Rtree t(tree, tree.get_allocator());
+        Rtree t(tree.parameters(), tree.indexable_get(), tree.value_eq(), tree.get_allocator());
         bgi::insert(t, input);
         BOOST_CHECK(tree.size() == t.size());
         std::vector<Value> output;