|
From: Jan G. <jan...@us...> - 2007-02-18 23:03:40
|
Update of /cvsroot/boost-sandbox/boost-sandbox/libs/circular_buffer/test In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30871/libs/circular_buffer/test Modified Files: common.ipp space_optimized_test.cpp Log Message: consistent usage of capacity_type Index: space_optimized_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/circular_buffer/test/space_optimized_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- space_optimized_test.cpp 23 Jan 2007 23:12:35 -0000 1.10 +++ space_optimized_test.cpp 18 Feb 2007 23:03:27 -0000 1.11 @@ -32,32 +32,32 @@ cb_space_optimized cb3(capacity_ctrl(20, 10), v.begin(), v.end()); BOOST_CHECK(cb1.size() == 0); - BOOST_CHECK(cb1.capacity() == 10); - BOOST_CHECK(cb1.min_capacity() == 10); + BOOST_CHECK(cb1.capacity().capacity() == 10); + BOOST_CHECK(cb1.capacity().min_capacity() == 10); BOOST_CHECK(cb2[0] == 1); BOOST_CHECK(cb2.size() == 10); BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb2.min_capacity() == 5); + BOOST_CHECK(cb2.capacity().min_capacity() == 5); BOOST_CHECK(cb3[0] == 1); BOOST_CHECK(cb3.size() == 5); BOOST_CHECK(cb3.capacity() == 20); - BOOST_CHECK(cb3.min_capacity() == 10); - BOOST_CHECK(cb1.min_capacity() <= cb1.internal_capacity()); - BOOST_CHECK(cb2.min_capacity() <= cb2.internal_capacity()); - BOOST_CHECK(cb3.min_capacity() <= cb3.internal_capacity()); + BOOST_CHECK(cb3.capacity().min_capacity() == 10); + BOOST_CHECK(cb1.capacity().min_capacity() <= cb1.internal_capacity()); + BOOST_CHECK(cb2.capacity().min_capacity() <= cb2.internal_capacity()); + BOOST_CHECK(cb3.capacity().min_capacity() <= cb3.internal_capacity()); cb2.erase(cb2.begin() + 2, cb2.end()); BOOST_CHECK(cb2.size() == 2); - BOOST_CHECK(cb2.min_capacity() <= cb2.internal_capacity()); + BOOST_CHECK(cb2.capacity().min_capacity() <= cb2.internal_capacity()); cb2.clear(); cb3.clear(); BOOST_CHECK(cb2.empty()); BOOST_CHECK(cb3.empty()); - BOOST_CHECK(cb2.min_capacity() <= cb2.internal_capacity()); - BOOST_CHECK(cb3.min_capacity() <= cb3.internal_capacity()); + BOOST_CHECK(cb2.capacity().min_capacity() <= cb2.internal_capacity()); + BOOST_CHECK(cb3.capacity().min_capacity() <= cb3.internal_capacity()); } // test main Index: common.ipp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/circular_buffer/test/common.ipp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- common.ipp 22 Dec 2006 19:41:24 -0000 1.12 +++ common.ipp 18 Feb 2007 23:03:27 -0000 1.13 @@ -150,6 +150,8 @@ const CB_CONTAINER<MyInteger> cb2(10, 0); CB_CONTAINER<MyInteger>::allocator_type& alloc_ref = cb1.get_allocator(); CB_CONTAINER<MyInteger>::allocator_type alloc = cb2.get_allocator(); + alloc_ref.max_size(); + alloc.max_size(); generic_test(cb1); } |