Merge changes for 1.54

[SVN r84342]
This commit is contained in:
Ion Gaztañaga committed 2013-05-18 10:52:46 +00:00
1 parent a479114dc9
commit f74eb7fab0
33 files changed
+78 -582

No files matched your search

+1 -1
View File
@@ -21,7 +21,7 @@ rule test_all
for local fileb in [ glob *.cpp ]
{
all_rules += [ run $(fileb) /boost/thread//boost_thread
all_rules += [ run $(fileb)
: # additional args
: # test-files
: # requirements
+2 -2
View File
@@ -50,8 +50,8 @@ int main()
base_slist.push_front(*it), member_list.push_back(*it);
//Now test lists
BaseSList::iterator bit(base_slist.begin()), bitend(base_slist.end());
MemberList::reverse_iterator mrit(member_list.rbegin()), mritend(member_list.rend());
BaseSList::iterator bit(base_slist.begin());
MemberList::reverse_iterator mrit(member_list.rbegin());
std::vector<MyClass>::reverse_iterator rit(values.rbegin()), ritend(values.rend());
//Test the objects inserted in the base hook list
+2 -2
View File
@@ -69,8 +69,8 @@ int main()
//Now test avl_sets
{
BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend());
MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end());
BaseSet::reverse_iterator rbit(baseset.rbegin());
MemberMultiset::iterator mit(membermultiset.begin());
VectIt it(values.begin()), itend(values.end());
//Test the objects inserted in the base hook avl_set
+28
View File
@@ -9,6 +9,7 @@
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
#include <boost/detail/no_exceptions_support.hpp>
//[doc_erasing_and_disposing
#include <boost/intrusive/list.hpp>
@@ -50,18 +51,45 @@ int main()
//Fill all the nodes and insert them in the list
my_class_list list;
//<-
#if 1
BOOST_TRY{
#else
//->
try{
//<-
#endif
//->
//Insert new objects in the container
for(int i = 0; i < MaxElem; ++i) list.push_back(*new my_class(i));
//Now use remove_and_dispose_if to erase and delete the objects
list.remove_and_dispose_if(is_even(), delete_disposer());
}
//<-
#if 1
BOOST_CATCH(...){
#else
//->
catch(...){
//<-
#endif
//->
//If something throws, make sure that all the memory is freed
list.clear_and_dispose(delete_disposer());
//<-
#if 1
BOOST_RETHROW
#else
//->
throw;
//<-
#endif
//->
}
//<-
BOOST_CATCH_END
//->
//Dispose remaining elements
list.erase_and_dispose(list.begin(), list.end(), delete_disposer());
+2 -2
View File
@@ -57,8 +57,8 @@ int main()
//Now test lists
{
BaseList::reverse_iterator rbit(baselist.rbegin()), rbitend(baselist.rend());
MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end());
BaseList::reverse_iterator rbit(baselist.rbegin());
MemberList::iterator mit(memberlist.begin());
VectIt it(values.begin()), itend(values.end());
//Test the objects inserted in the base hook list
+2 -2
View File
@@ -58,8 +58,8 @@ int main()
//Now test lists
{
BaseList::reverse_iterator rbit(baselist.rbegin()), rbitend(baselist.rend());
MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end());
BaseList::reverse_iterator rbit(baselist.rbegin());
MemberList::iterator mit(memberlist.begin());
VectIt it(values.begin()), itend(values.end());
//Test the objects inserted in the base hook list
+15
View File
@@ -10,6 +10,18 @@
//
/////////////////////////////////////////////////////////////////////////////
#include <boost/config.hpp>
#ifdef BOOST_NO_EXCEPTIONS
//Interprocess does not support BOOST_NO_EXCEPTIONS so nothing to test here
int main()
{
return 0;
}
#else //!BOOST_NO_EXCEPTIONS
//This is needed to allow concurrent test execution in
//several platforms. The shared memory must be unique
//for each process...
@@ -100,3 +112,6 @@ int main()
return 0;
}
//]
#endif //BOOST_NO_EXCEPTIONS
+2 -2
View File
@@ -69,8 +69,8 @@ int main()
//Now test sets
{
BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend());
MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end());
BaseSet::reverse_iterator rbit(baseset.rbegin());
MemberMultiset::iterator mit(membermultiset.begin());
VectIt it(values.begin()), itend(values.end());
//Test the objects inserted in the base hook set
+2 -2
View File
@@ -68,8 +68,8 @@ int main()
//Now test sg_sets
{
BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend());
MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end());
BaseSet::reverse_iterator rbit(baseset.rbegin());
MemberMultiset::iterator mit(membermultiset.begin());
VectIt it(values.begin()), itend(values.end());
//Test the objects inserted in the base hook sg_set
+2 -2
View File
@@ -60,8 +60,8 @@ int main()
//Now test lists
{
BaseList::iterator bit(baselist.begin()), bitend(baselist.end());
MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end());
BaseList::iterator bit(baselist.begin());
MemberList::iterator mit(memberlist.begin());
VectRit rit(values.rbegin()), ritend(values.rend());
VectIt it(values.begin()), itend(values.end());
+3 -3
View File
@@ -72,9 +72,9 @@ int main()
//Now test sets
{
BaseSplaySet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend());
BaseBsSplaySet::iterator bsit(bsbaseset.begin()), bsitend(bsbaseset.end());
MemberSplayMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end());
BaseSplaySet::reverse_iterator rbit(baseset.rbegin());
BaseBsSplaySet::iterator bsit(bsbaseset.begin());
MemberSplayMultiset::iterator mit(membermultiset.begin());
VectIt it(values.begin()), itend(values.end());
//Test the objects inserted in the base hook set
+2 -2
View File
@@ -79,8 +79,8 @@ int main()
//Now test treap_sets
{
BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend());
MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end());
BaseSet::reverse_iterator rbit(baseset.rbegin());
MemberMultiset::iterator mit(membermultiset.begin());
VectIt it(values.begin()), itend(values.end());
//Test the objects inserted in the base hook treap_set
+1 -2
View File
@@ -71,8 +71,7 @@ int main()
base_set.insert(*it);
//Now insert values's and values2's elements in the unordered_multiset
for(VectIt it(values.begin()), itend(values.end()),
it2(values2.begin()),itend2(values2.end())
for(VectIt it(values.begin()), itend(values.end()), it2(values2.begin())
; it != itend; ++it, ++it2){
member_multi_set.insert(*it);
member_multi_set.insert(*it2);