boost::container::vector used in dynamic nodes. detail::static_vector renamed to detail::varray. Added Alloc parameter to varray. rtree::envelope() renamed to rtree::bounds(). Tests moddified. Docs tweaked.

[SVN r82766]
This commit is contained in:
Adam Wulkiewicz
2013-02-06 20:56:29 +00:00
parent ce4d807159
commit a90b56de26
26 changed files with 699 additions and 1020 deletions

View File

@@ -104,61 +104,61 @@ void test_rtree_elements_exceptions(Parameters const& parameters = Parameters())
for ( size_t i = 0 ; i < 100 ; i += 2 )
{
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(10000);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(10000);
Tree tree(parameters);
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(i);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(i);
BOOST_CHECK_THROW( tree.insert(input.begin(), input.end()), throwing_static_vector_exception );
BOOST_CHECK_THROW( tree.insert(input.begin(), input.end()), throwing_varray_exception );
}
for ( size_t i = 0 ; i < 50 ; i += 2 )
{
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(10000);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(10000);
Tree tree(parameters);
tree.insert(input.begin(), input.end());
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(i);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(i);
BOOST_CHECK_THROW( tree.remove(input.begin(), input.end()), throwing_static_vector_exception );
BOOST_CHECK_THROW( tree.remove(input.begin(), input.end()), throwing_varray_exception );
}
for ( size_t i = 0 ; i < 50 ; i += 2 )
{
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(10000);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(10000);
Tree tree(parameters);
tree.insert(input.begin(), input.end());
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(i);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(i);
BOOST_CHECK_THROW( Tree tree2(tree), throwing_static_vector_exception );
BOOST_CHECK_THROW( Tree tree2(tree), throwing_varray_exception );
}
for ( size_t i = 0 ; i < 50 ; i += 2 )
{
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(10000);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(10000);
Tree tree(parameters);
Tree tree2(parameters);
tree.insert(input.begin(), input.end());
throwing_static_vector_settings::reset_calls_counter();
throwing_static_vector_settings::set_max_calls(i);
throwing_varray_settings::reset_calls_counter();
throwing_varray_settings::set_max_calls(i);
BOOST_CHECK_THROW(tree2 = tree, throwing_static_vector_exception );
BOOST_CHECK_THROW(tree2 = tree, throwing_varray_exception );
}
}