Update of /cvsroot/boost/boost/boost/interprocess/containers
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19387/containers
Modified Files:
deque.hpp flat_map.hpp flat_set.hpp list.hpp set.hpp slist.hpp
string.hpp vector.hpp
Log Message:
Changes to correct regression tests for intel-win-9.1 & cw-9.4
Index: deque.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/deque.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- deque.hpp 4 May 2007 20:53:08 -0000 1.6
+++ deque.hpp 12 May 2007 12:51:20 -0000 1.7
@@ -26,7 +26,7 @@
*/
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2005-2006. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2006. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -35,7 +35,7 @@
//////////////////////////////////////////////////////////////////////////////
//
// This file comes from SGI's stl_deque.h and stl_uninitialized.h files.
-// Modified by Ion Gaztañaga 2005.
+// Modified by Ion Gaztanaga 2005.
// Renaming, isolating and porting to generic algorithms. Pointer typedef
// set to allocator::pointer to allow placing it in shared memory.
//
@@ -486,8 +486,8 @@
typedef typename Base::iterator iterator;
typedef typename Base::const_iterator const_iterator;
- typedef reverse_iterator<const_iterator> const_reverse_iterator;
- typedef reverse_iterator<iterator> reverse_iterator;
+ typedef boost::reverse_iterator<const_iterator> const_reverse_iterator;
+ typedef boost::reverse_iterator<iterator> reverse_iterator;
/// @cond
protected: // Internal typedefs
@@ -690,7 +690,7 @@
{
if (this->m_finish.m_cur != this->m_finish.m_first) {
--this->m_finish.m_cur;
- this->allocator_type::destroy(this->m_finish.m_cur);
+ static_cast<allocator_type*>(this)->destroy(this->m_finish.m_cur);
}
else
this->priv_pop_back_aux();
@@ -699,7 +699,7 @@
void pop_front()
{
if (this->m_start.m_cur != this->m_start.m_last - 1) {
- this->allocator_type::destroy(this->m_start.m_cur);
+ static_cast<allocator_type*>(this)->destroy(this->m_start.m_cur);
++this->m_start.m_cur;
}
else
@@ -927,10 +927,10 @@
}
void priv_destroy_range(iterator p, iterator p2)
- { for(;p != p2; ++p) this->allocator_type::destroy(&*p); }
+ { for(;p != p2; ++p) static_cast<allocator_type*>(this)->destroy(&*p); }
void priv_destroy_range(pointer p, pointer p2)
- { for(;p != p2; ++p) this->allocator_type::destroy(p); }
+ { for(;p != p2; ++p) static_cast<allocator_type*>(this)->destroy(p); }
template <class Integer>
void priv_assign_dispatch(Integer n, Integer val, boost::mpl::true_)
@@ -1213,7 +1213,7 @@
this->priv_deallocate_node(this->m_finish.m_first);
this->m_finish.priv_set_node(this->m_finish.m_node - 1);
this->m_finish.m_cur = this->m_finish.m_last - 1;
- this->allocator_type::destroy(this->m_finish.m_cur);
+ static_cast<allocator_type*>(this)->destroy(this->m_finish.m_cur);
}
// Called only if this->m_start.m_cur == this->m_start.m_last - 1. Note
that
@@ -1222,7 +1222,7 @@
// must have at least two nodes.
void priv_pop_front_aux()
{
- this->allocator_type::destroy(this->m_start.m_cur);
+ static_cast<allocator_type*>(this)->destroy(this->m_start.m_cur);
this->priv_deallocate_node(this->m_start.m_first);
this->m_start.priv_set_node(this->m_start.m_node + 1);
this->m_start.m_cur = this->m_start.m_first;
@@ -1341,7 +1341,7 @@
}
BOOST_CATCH(...){
for(;first2 != mid2; ++first2){
- this->allocator_type::destroy(&*first2);
+ static_cast<allocator_type*>(this)->destroy(&*first2);
}
}
BOOST_CATCH_END
@@ -1360,7 +1360,7 @@
}
BOOST_CATCH(...){
for(;result != mid; ++result){
- this->allocator_type::destroy(&*result);
+ static_cast<allocator_type*>(this)->destroy(&*result);
}
BOOST_RETHROW
}
@@ -1382,7 +1382,7 @@
}
BOOST_CATCH(...){
for(;result != mid; ++result){
- this->allocator_type::destroy(&*result);
+ static_cast<allocator_type*>(this)->destroy(&*result);
}
BOOST_RETHROW
}
Index: flat_map.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/flat_map.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flat_map.hpp 4 May 2007 20:53:08 -0000 1.3
+++ flat_map.hpp 12 May 2007 12:51:20 -0000 1.4
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2005-2007. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2007. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
Index: flat_set.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/flat_set.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flat_set.hpp 4 May 2007 20:53:08 -0000 1.3
+++ flat_set.hpp 12 May 2007 12:51:20 -0000 1.4
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2005-2007. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2007. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
Index: list.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/list.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- list.hpp 4 May 2007 20:53:08 -0000 1.5
+++ list.hpp 12 May 2007 12:51:20 -0000 1.6
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2005-2007. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2007. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -8,7 +8,7 @@
//
//////////////////////////////////////////////////////////////////////////////
//
-// This file comes from SGI's stl_list.h file. Modified by Ion Gaztañaga 2004
+// This file comes from SGI's stl_list.h file. Modified by Ion Gaztanaga 2004
// Renaming, isolating and porting to generic algorithms. Pointer typedef
// set to allocator::pointer to allow placing it in shared memory.
//
Index: set.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/set.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- set.hpp 4 May 2007 20:53:08 -0000 1.4
+++ set.hpp 12 May 2007 12:51:20 -0000 1.5
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2005-2007. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2007. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -8,7 +8,7 @@
//
//////////////////////////////////////////////////////////////////////////////
//
-// This file comes from SGI's stl_set/stl_multiset files. Modified by Ion
Gaztañaga 2004.
+// This file comes from SGI's stl_set/stl_multiset files. Modified by Ion
Gaztanaga 2004.
// Renaming, isolating and porting to generic algorithms. Pointer typedef
// set to allocator::pointer to allow placing it in shared memory.
//
Index: slist.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/slist.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- slist.hpp 4 May 2007 20:53:08 -0000 1.4
+++ slist.hpp 12 May 2007 12:51:20 -0000 1.5
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2004-2007. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2004-2007. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -8,7 +8,7 @@
//
//////////////////////////////////////////////////////////////////////////////
//
-// This file comes from SGI's stl_slist.h file. Modified by Ion Gaztañaga
2004-2007
+// This file comes from SGI's stl_slist.h file. Modified by Ion Gaztanaga
2004-2007
// Renaming, isolating and porting to generic algorithms. Pointer typedef
// set to allocator::pointer to allow placing it in shared memory.
//
Index: string.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/string.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- string.hpp 4 May 2007 20:53:08 -0000 1.4
+++ string.hpp 12 May 2007 12:51:20 -0000 1.5
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2005-2007. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2007. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -8,7 +8,7 @@
//
//////////////////////////////////////////////////////////////////////////////
//
-// This file comes from SGI's string file. Modified by Ion Gaztañaga 2004-2007
+// This file comes from SGI's string file. Modified by Ion Gaztanaga 2004-2007
// Renaming, isolating and porting to generic algorithms. Pointer typedef
// set to allocator::pointer to allow placing it in shared memory.
//
@@ -249,6 +249,8 @@
const pointer &reuse,
allocator_v1)
{
+ (void)limit_size;
+ (void)reuse;
if(!(command & allocate_new))
return std::pair<pointer, bool>(0, 0);
received_size = preferred_size;
Index: vector.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/vector.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vector.hpp 4 May 2007 20:53:08 -0000 1.5
+++ vector.hpp 12 May 2007 12:51:20 -0000 1.6
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2005-2007. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2007. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -8,7 +8,7 @@
//
//////////////////////////////////////////////////////////////////////////////
//
-// This file comes from SGI's stl_vector.h file. Modified by Ion Gaztañaga.
+// This file comes from SGI's stl_vector.h file. Modified by Ion Gaztanaga.
// Renaming, isolating and porting to generic algorithms. Pointer typedef
// set to allocator::pointer to allow placing it in shared memory.
//
@@ -125,6 +125,8 @@
const pointer &reuse,
allocator_v1)
{
+ (void)limit_size;
+ (void)reuse;
if(!(command & allocate_new))
return std::pair<pointer, bool>(0, 0);
received_size = preferred_size;
@@ -364,10 +366,10 @@
};
//! Iterator used to iterate backwards through a vector.
- typedef typename boost::reverse_iterator<iterator>
+ typedef boost::reverse_iterator<iterator>
reverse_iterator;
//! Const iterator used to iterate backwards through a vector.
- typedef typename boost::reverse_iterator<const_iterator>
+ typedef boost::reverse_iterator<const_iterator>
const_reverse_iterator;
public:
-------------------------------------------------------------------------
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
