Update of /cvsroot/boost/boost/libs/intrusive/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3113/test
Modified Files:
common_functors.hpp Jamfile.v2 list_test.cpp multiset_test.cpp
set_test.cpp slist_test.cpp test_container.hpp
unordered_multiset_test.cpp unordered_set_test.cpp
Log Message:
no message
Index: common_functors.hpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/common_functors.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- common_functors.hpp 12 May 2007 12:34:54 -0000 1.2
+++ common_functors.hpp 23 Jun 2007 13:06:49 -0000 1.3
@@ -19,7 +19,7 @@
namespace intrusive {
namespace test {
-class delete_destroyer
+class delete_disposer
{
public:
template <class Pointer>
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/Jamfile.v2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Jamfile.v2 4 May 2007 21:30:53 -0000 1.1
+++ Jamfile.v2 23 Jun 2007 13:06:49 -0000 1.2
@@ -31,4 +31,4 @@
return $(all_rules) ;
}
-test-suite intrusive_test : [ test_all r ] ;
+test-suite intrusive_test : [ test_all r ] : <threading>multi ;
Index: list_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/list_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- list_test.cpp 12 May 2007 12:34:54 -0000 1.2
+++ list_test.cpp 23 Jun 2007 13:06:49 -0000 1.3
@@ -10,6 +10,8 @@
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
+
+#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/list.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include "itestvalue.hpp"
@@ -269,9 +271,9 @@
list_type testlist1 (&values[0], &values[0] + values.size());
list_type testlist2;
- testlist2.clone_from(testlist1, test::new_cloner(),
test::delete_destroyer());
+ testlist2.clone_from(testlist1, test::new_cloner(),
test::delete_disposer());
BOOST_TEST (testlist2 == testlist1);
- testlist2.clear_and_destroy(test::delete_destroyer());
+ testlist2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testlist2.empty());
}
@@ -321,23 +323,23 @@
return 0;
}
};
-/*
+
//Explicit instantiations of non-counted classes
-template class boost::intrusive::list<list_base_raw, false>;
-template class boost::intrusive::list<list_member_raw, false>;
-template class boost::intrusive::list<list_auto_base_raw, false>;
-template class boost::intrusive::list<list_auto_member_raw, false>;
-template class boost::intrusive::list<list_base_smart, false>;
-template class boost::intrusive::list<list_member_smart, false>;
-template class boost::intrusive::list<list_auto_base_smart, false>;
-template class boost::intrusive::list<list_auto_member_smart, false>;
+//template class boost::intrusive::list<list_base_raw, false>;
+//template class boost::intrusive::list<list_member_raw, false>;
+//template class boost::intrusive::list<list_auto_base_raw, false>;
+//template class boost::intrusive::list<list_auto_member_raw, false>;
+//template class boost::intrusive::list<list_base_smart, false>;
+//template class boost::intrusive::list<list_member_smart, false>;
+//template class boost::intrusive::list<list_auto_base_smart, false>;
+//template class boost::intrusive::list<list_auto_member_smart, false>;
//Explicit instantiation of counted classes
-template class boost::intrusive::list<list_base_raw_t, true>;
-template class boost::intrusive::list<list_member_raw_t, true>;
-template class boost::intrusive::list<list_base_smart_t, true>;
-template class boost::intrusive::list<list_member_smart_t, true>;
-*/
+//template class boost::intrusive::list<list_base_raw_t, true>;
+//template class boost::intrusive::list<list_member_raw_t, true>;
+//template class boost::intrusive::list<list_base_smart_t, true>;
+//template class boost::intrusive::list<list_member_smart_t, true>;
+
int main( int, char* [] )
{
test_main_template<void*, false>()();
@@ -346,3 +348,4 @@
test_main_template<boost::intrusive::smart_ptr<void>, true>()();
return boost::report_errors();
}
+#include <boost/intrusive/detail/config_end.hpp>
Index: multiset_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/multiset_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- multiset_test.cpp 12 May 2007 12:34:54 -0000 1.2
+++ multiset_test.cpp 23 Jun 2007 13:06:50 -0000 1.3
@@ -10,7 +10,7 @@
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
-
+#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/set.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include "itestvalue.hpp"
@@ -201,9 +201,9 @@
multiset_type testmultiset1 (&values[0], &values[0] + values.size());
multiset_type testmultiset2;
- testmultiset2.clone_from(testmultiset1, test::new_cloner(),
test::delete_destroyer());
+ testmultiset2.clone_from(testmultiset1, test::new_cloner(),
test::delete_disposer());
BOOST_TEST (testmultiset2 == testmultiset1);
- testmultiset2.clear_and_destroy(test::delete_destroyer());
+ testmultiset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testmultiset2.empty());
}
@@ -293,4 +293,4 @@
return boost::report_errors();
}
-
+#include <boost/intrusive/detail/config_end.hpp>
Index: set_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/set_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- set_test.cpp 12 May 2007 12:34:54 -0000 1.2
+++ set_test.cpp 23 Jun 2007 13:06:50 -0000 1.3
@@ -10,7 +10,7 @@
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
-
+#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/set.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include "itestvalue.hpp"
@@ -204,9 +204,9 @@
set_type testset1 (&values[0], &values[0] + values.size());
set_type testset2;
- testset2.clone_from(testset1, test::new_cloner(),
test::delete_destroyer());
+ testset2.clone_from(testset1, test::new_cloner(),
test::delete_disposer());
BOOST_TEST (testset2 == testset1);
- testset2.clear_and_destroy(test::delete_destroyer());
+ testset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testset2.empty());
}
@@ -295,3 +295,4 @@
test_main_template<boost::intrusive::smart_ptr<void>, true>()();
return boost::report_errors();
}
+#include <boost/intrusive/detail/config_end.hpp>
Index: slist_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/slist_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slist_test.cpp 12 May 2007 12:34:54 -0000 1.2
+++ slist_test.cpp 23 Jun 2007 13:06:50 -0000 1.3
@@ -10,6 +10,7 @@
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
+#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/slist.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include "itestvalue.hpp"
@@ -302,9 +303,9 @@
list_type testlist1 (&values[0], &values[0] + values.size());
list_type testlist2;
- testlist2.clone_from(testlist1, test::new_cloner(),
test::delete_destroyer());
+ testlist2.clone_from(testlist1, test::new_cloner(),
test::delete_disposer());
BOOST_TEST (testlist2 == testlist1);
- testlist2.clear_and_destroy(test::delete_destroyer());
+ testlist2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testlist2.empty());
}
@@ -379,3 +380,4 @@
test_main_template<boost::intrusive::smart_ptr<void>, true>()();
return boost::report_errors();
}
+#include <boost/intrusive/detail/config_end.hpp>
Index: test_container.hpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/test_container.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_container.hpp 12 May 2007 12:34:54 -0000 1.2
+++ test_container.hpp 23 Jun 2007 13:06:50 -0000 1.3
@@ -38,7 +38,7 @@
Move constructor X(a) X().size() == a.size(). X() contains a copy of
each of a's elements.
Move constructor X b(a); b.size() == a.size(). b contains a copy of
each of a's elements.
Move Assignment operator b = a b.size() == a.size(). b contains a copy
of each of a's elements.
-Destructor a.~X() Each of a's elements is destroyed, and memory allocated
for them (if any) is deallocated.
+Destructor a.~X() Each of a's elements is disposed, and memory allocated
for them (if any) is deallocated.
Beginning of range a.begin() Returns an iterator pointing to the first
element in the container. [7] a.begin() is either dereferenceable or
past-the-end. It is past-the-end if and only if a.size() == 0.
End of range a.end() Returns an iterator pointing one past the last
element in the container. a.end() is past-the-end.
Size a.size() Returns the size of the container, that is, its number of
elements. [8] a.size() >= 0 && a.size() <= max_size()
Index: unordered_multiset_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/unordered_multiset_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- unordered_multiset_test.cpp 12 May 2007 12:34:54 -0000 1.2
+++ unordered_multiset_test.cpp 23 Jun 2007 13:06:50 -0000 1.3
@@ -11,6 +11,7 @@
//
/////////////////////////////////////////////////////////////////////////////
+#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/unordered_set.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include "itestvalue.hpp"
@@ -281,14 +282,14 @@
unordered_multiset_type testset1 (buckets1, BucketSize, values.begin(),
values.end());
unordered_multiset_type testset2 (buckets2, BucketSize);
- testset2.clone_from(testset1, test::new_cloner(),
test::delete_destroyer());
+ testset2.clone_from(testset1, test::new_cloner(),
test::delete_disposer());
//Ordering is not guarantee in the cloning so insert data in a set and
test
std::multiset<typename ValueTraits::value_type>
src(testset1.begin(), testset1.end());
std::multiset<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_TEST (src == dst);
- testset2.clear_and_destroy(test::delete_destroyer());
+ testset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testset2.empty());
}
{
@@ -298,14 +299,14 @@
unordered_multiset_type testset1 (buckets1, BucketSize*2,
values.begin(), values.end());
unordered_multiset_type testset2 (buckets2, BucketSize);
- testset2.clone_from(testset1, test::new_cloner(),
test::delete_destroyer());
+ testset2.clone_from(testset1, test::new_cloner(),
test::delete_disposer());
//Ordering is not guarantee in the cloning so insert data in a set and
test
std::multiset<typename ValueTraits::value_type>
src(testset1.begin(), testset1.end());
std::multiset<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_TEST (src == dst);
- testset2.clear_and_destroy(test::delete_destroyer());
+ testset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testset2.empty());
}
{
@@ -315,14 +316,14 @@
unordered_multiset_type testset1 (buckets1, BucketSize, values.begin(),
values.end());
unordered_multiset_type testset2 (buckets2, BucketSize*2);
- testset2.clone_from(testset1, test::new_cloner(),
test::delete_destroyer());
+ testset2.clone_from(testset1, test::new_cloner(),
test::delete_disposer());
//Ordering is not guarantee in the cloning so insert data in a set and
test
std::multiset<typename ValueTraits::value_type>
src(testset1.begin(), testset1.end());
std::multiset<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_TEST (src == dst);
- testset2.clear_and_destroy(test::delete_destroyer());
+ testset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testset2.empty());
}
}
@@ -375,6 +376,7 @@
return 0;
}
};
+
/*
//Explicit instantiations of non-counted classes
template class boost::intrusive::unordered_multiset
@@ -428,6 +430,7 @@
, boost::hash<unordered_set_member_smart_t::value_type>
, std::equal_to<unordered_set_member_smart_t::value_type>, true>;
*/
+
int main( int, char* [] )
{
test_main_template<void*, false>()();
@@ -436,3 +439,5 @@
test_main_template<boost::intrusive::smart_ptr<void>, true>()();
return boost::report_errors();
}
+
+#include <boost/intrusive/detail/config_end.hpp>
Index: unordered_set_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/intrusive/test/unordered_set_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- unordered_set_test.cpp 12 May 2007 12:34:54 -0000 1.2
+++ unordered_set_test.cpp 23 Jun 2007 13:06:50 -0000 1.3
@@ -10,7 +10,7 @@
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
-
+#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/unordered_set.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include "itestvalue.hpp"
@@ -257,14 +257,14 @@
unordered_set_type testset1 (buckets1, BucketSize, values.begin(),
values.end());
unordered_set_type testset2 (buckets2, BucketSize);
- testset2.clone_from(testset1, test::new_cloner(),
test::delete_destroyer());
+ testset2.clone_from(testset1, test::new_cloner(),
test::delete_disposer());
//Ordering is not guarantee in the cloning so insert data in a set and
test
std::set<typename ValueTraits::value_type>
src(testset1.begin(), testset1.end());
std::set<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_TEST (src == dst );
- testset2.clear_and_destroy(test::delete_destroyer());
+ testset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testset2.empty());
}
{
@@ -274,14 +274,14 @@
unordered_set_type testset1 (buckets1, BucketSize*2, values.begin(),
values.end());
unordered_set_type testset2 (buckets2, BucketSize);
- testset2.clone_from(testset1, test::new_cloner(),
test::delete_destroyer());
+ testset2.clone_from(testset1, test::new_cloner(),
test::delete_disposer());
//Ordering is not guarantee in the cloning so insert data in a set and
test
std::set<typename ValueTraits::value_type>
src(testset1.begin(), testset1.end());
std::set<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_TEST (src == dst );
- testset2.clear_and_destroy(test::delete_destroyer());
+ testset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testset2.empty());
}
{
@@ -291,14 +291,14 @@
unordered_set_type testset1 (buckets1, BucketSize, values.begin(),
values.end());
unordered_set_type testset2 (buckets2, BucketSize*2);
- testset2.clone_from(testset1, test::new_cloner(),
test::delete_destroyer());
+ testset2.clone_from(testset1, test::new_cloner(),
test::delete_disposer());
//Ordering is not guarantee in the cloning so insert data in a set and
test
std::set<typename ValueTraits::value_type>
src(testset1.begin(), testset1.end());
std::set<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_TEST (src == dst );
- testset2.clear_and_destroy(test::delete_destroyer());
+ testset2.clear_and_dispose(test::delete_disposer());
BOOST_TEST (testset2.empty());
}
}
@@ -411,3 +411,4 @@
test_main_template<boost::intrusive::smart_ptr<void>, true>()();
return boost::report_errors();
}
+#include <boost/intrusive/detail/config_end.hpp>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
