Update of /cvsroot/boost/boost/libs/interprocess/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28788/test
Modified Files:
intrusive_ptr_test.cpp list_test.hpp slist_test.cpp
string_test.cpp
Log Message:
Fixed gcc compilation errors
Index: intrusive_ptr_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/intrusive_ptr_test.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- intrusive_ptr_test.cpp 12 May 2007 12:31:51 -0000 1.3
+++ intrusive_ptr_test.cpp 23 May 2007 16:14:00 -0000 1.4
@@ -15,7 +15,6 @@
#include <boost/interprocess/managed_shared_memory.hpp>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/atomic_count.hpp>
#include <boost/config.hpp>
#include <algorithm>
#include <functional>
@@ -45,7 +44,7 @@
{
private:
- boost::detail::atomic_count use_count_;
+ int use_count_;
base(base const &);
base & operator=(base const &);
@@ -67,22 +66,6 @@
return use_count_;
}
-#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
-
- inline friend void intrusive_ptr_add_ref
- (base * p)
- {
- ++p->use_count_;
- }
-
- inline friend void intrusive_ptr_release
- (base * p)
- {
- if(--p->use_count_ == 0) delete p;
- }
-
-#else
-
void add_ref()
{
++use_count_;
@@ -92,17 +75,10 @@
{
if(--use_count_ == 0) delete this;
}
-
-#endif
};
} // namespace N
-#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
-
-namespace boost
-{
-
inline void intrusive_ptr_add_ref
(const boost::interprocess::offset_ptr<N::base> &p)
{
@@ -115,12 +91,6 @@
p->release();
}
-} // namespace boost
-
-#endif
-
-//
-
struct X: public virtual N::base
{
};
@@ -181,9 +151,6 @@
boost::interprocess::offset_ptr<X> p = new X;
BOOST_TEST(p->use_count() == 0);
-#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
- using boost::intrusive_ptr_add_ref;
-#endif
intrusive_ptr_add_ref(get_pointer(p));
BOOST_TEST(p->use_count() == 1);
Index: list_test.hpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/list_test.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- list_test.hpp 12 May 2007 12:31:51 -0000 1.3
+++ list_test.hpp 23 May 2007 16:14:00 -0000 1.4
@@ -29,7 +29,7 @@
struct push_data_function
{
template<class MyShmList, class MyStdList>
- int operator()(int max, MyShmList *shmlist, MyStdList *stdlist) const
+ static int execute(int max, MyShmList *shmlist, MyStdList *stdlist)
{
typedef typename MyShmList::value_type IntType;
for(int i = 0; i < max; ++i){
@@ -46,7 +46,7 @@
struct push_data_function<false>
{
template<class MyShmList, class MyStdList>
- int operator()(int max, MyShmList *shmlist, MyStdList *stdlist) const
+ static int execute(int max, MyShmList *shmlist, MyStdList *stdlist)
{
typedef typename MyShmList::value_type IntType;
for(int i = 0; i < max; ++i){
@@ -63,7 +63,7 @@
struct pop_back_function
{
template<class MyStdList, class MyShmList>
- int operator()(MyShmList *shmlist, MyStdList *stdlist) const
+ static int execute(MyShmList *shmlist, MyStdList *stdlist)
{
shmlist->pop_back();
stdlist->pop_back();
@@ -76,7 +76,7 @@
struct pop_back_function<false>
{
template<class MyStdList, class MyShmList>
- int operator()(MyShmList *shmlist, MyStdList *stdlist) const
+ static int execute(MyShmList *shmlist, MyStdList *stdlist)
{
(void)shmlist; (void)stdlist;
return 0;
@@ -84,7 +84,6 @@
};
-
template<class ManagedSharedMemory
,class MyShmList
,bool DoublyLinked>
@@ -112,7 +111,19 @@
MyStdList *stdlist = new MyStdList;
- if(push_data_t()(max, shmlist, stdlist)){
+/*
+ {
+ typedef typename MyShmList::value_type IntType;
+ for(int i = 0; i < max; ++i){
+ IntType move_me(i);
+ shmlist->push_front(move(move_me));
+ stdlist->push_front(i);
+ }
+ if(!CheckEqualContainers(shmlist, stdlist)) return 1;
+ return 0;
+ }*/
+
+ if(push_data_t::execute(max, shmlist, stdlist)){
return 1;
}
@@ -120,7 +131,7 @@
stdlist->erase(stdlist->begin()++);
if(!CheckEqualContainers(shmlist, stdlist)) return 1;
- if(pop_back_function<DoublyLinked>()(shmlist, stdlist)){
+ if(pop_back_function<DoublyLinked>::execute(shmlist, stdlist)){
return 1;
}
@@ -188,7 +199,7 @@
stdlist->resize(stdlist->size()/2);
if(!CheckEqualContainers(shmlist, stdlist)) return 1;
- if(push_data_t()(max, shmlist, stdlist)){
+ if(push_data_t::execute(max, shmlist, stdlist)){
return 1;
}
@@ -197,7 +208,7 @@
int listsize = (int)shmlist->size();
- if(push_data_t()(listsize, shmlist, stdlist)){
+ if(push_data_t::execute(listsize, shmlist, stdlist)){
return 1;
}
@@ -209,11 +220,11 @@
listsize = (int)shmlist->size();
- if(push_data_t()(listsize, shmlist, stdlist)){
+ if(push_data_t::execute(listsize, shmlist, stdlist)){
return 1;
}
- if(push_data_t()(listsize, &othershmlist, &otherstdlist)){
+ if(push_data_t::execute(listsize, &othershmlist, &otherstdlist)){
return 1;
}
Index: slist_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/slist_test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- slist_test.cpp 12 May 2007 12:31:51 -0000 1.5
+++ slist_test.cpp 23 May 2007 16:14:00 -0000 1.6
@@ -40,9 +40,6 @@
if(test::list_test<managed_shared_memory, MyMoveList, false>())
return 1;
- if(test::list_test<managed_shared_memory, MyCopyMoveList, false>())
- return 1;
-
return 0;
}
Index: string_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/string_test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- string_test.cpp 12 May 2007 12:31:51 -0000 1.5
+++ string_test.cpp 23 May 2007 16:14:00 -0000 1.6
@@ -10,6 +10,7 @@
#include <boost/interprocess/detail/config_begin.hpp>
#include <boost/interprocess/managed_shared_memory.hpp>
+#include <boost/interprocess/allocators/allocator.hpp>
#include <boost/interprocess/containers/vector.hpp>
#include <boost/interprocess/containers/string.hpp>
#include <boost/interprocess/offset_ptr.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
