Update of /cvsroot/boost/boost/boost/interprocess/containers/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19387/containers/detail
Modified Files:
flat_tree.hpp tree.hpp
Log Message:
Changes to correct regression tests for intel-win-9.1 & cw-9.4
Index: flat_tree.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/interprocess/containers/detail/flat_tree.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flat_tree.hpp 4 May 2007 20:53:10 -0000 1.4
+++ flat_tree.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)
//
Index: tree.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/detail/tree.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tree.hpp 4 May 2007 21:10:02 -0000 1.1
+++ tree.hpp 12 May 2007 12:51:20 -0000 1.2
@@ -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_tree file. Modified by Ion Gaztañaga 2005.
+// This file comes from SGI's stl_tree file. 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.
//
@@ -64,7 +64,7 @@
namespace boost { namespace interprocess { namespace detail {
template<class Key, class Value, class KeyCompare, class KeyOfValue>
-struct value_compare
+struct value_compare_impl
: public KeyCompare
{
typedef Value value_type;
@@ -75,7 +75,7 @@
typedef typename boost::mpl::if_c
<is_same<Key, Value>::value, dummy, Key>::type key_type;
- value_compare(key_compare kcomp)
+ value_compare_impl(key_compare kcomp)
: key_compare(kcomp)
{}
@@ -328,10 +328,10 @@
class KeyCompare, class A>
class rbtree
: protected detail::rbtree_alloc
- <A, value_compare<Key, Value, KeyCompare, KeyOfValue> >
+ <A, value_compare_impl<Key, Value, KeyCompare, KeyOfValue> >
{
typedef detail::rbtree_alloc
- < A, value_compare<Key, Value
+ < A, value_compare_impl<Key, Value
, KeyCompare, KeyOfValue> > AllocHolder;
typedef typename AllocHolder::NodePtr NodePtr;
typedef rbtree < Key, Value, KeyOfValue
@@ -350,7 +350,7 @@
typedef Value value_type;
typedef A allocator_type;
typedef KeyCompare key_compare;
- typedef value_compare< Key, Value
+ typedef value_compare_impl< Key, Value
, KeyCompare, KeyOfValue> value_compare;
typedef typename A::pointer pointer;
typedef typename A::const_pointer const_pointer;
@@ -394,6 +394,7 @@
, rbtree_const_pointer , rbtree_const_reference>
{
protected:
+ typedef typename Irbtree::iterator iiterator;
iiterator m_it;
explicit const_iterator(iiterator it) : m_it(it){}
void prot_incr() { ++m_it; }
-------------------------------------------------------------------------
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
