Update of /cvsroot/boost/boost/boost/interprocess/containers/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30311/containers/detail
Modified Files:
tree.hpp
Log Message:
no message
Index: tree.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/containers/detail/tree.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tree.hpp 12 Jun 2007 17:07:09 -0000 1.3
+++ tree.hpp 23 Jun 2007 12:53:54 -0000 1.4
@@ -47,8 +47,6 @@
#include <boost/interprocess/detail/move.hpp>
#include <boost/interprocess/detail/utilities.hpp>
-#include <boost/interprocess/detail/generic_cast.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
#include <boost/type_traits/has_trivial_destructor.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <boost/intrusive/rbtree.hpp>
@@ -417,7 +415,7 @@
public:
//rbtree const_iterator
class const_iterator
- : public boost::iterator
+ : public std::iterator
< std::bidirectional_iterator_tag
, value_type , rbtree_difference_type
, rbtree_const_pointer , rbtree_const_reference>
@@ -507,8 +505,8 @@
{ iterator tmp = *this; --*this; return tmp; }
};
- typedef boost::reverse_iterator<iterator> reverse_iterator;
- typedef boost::reverse_iterator<const_iterator> const_reverse_iterator;
+ typedef std::reverse_iterator<iterator> reverse_iterator;
+ typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
rbtree(const key_compare& comp = key_compare(),
const allocator_type& a = allocator_type())
@@ -837,16 +835,16 @@
}
iterator erase(const_iterator position)
- { return iterator(this->m_irbtree.erase_and_destroy(position.get(),
Destroyer(*this))); }
+ { return iterator(this->m_irbtree.erase_and_dispose(position.get(),
Destroyer(*this))); }
size_type erase(const key_type& k)
- { return this->m_irbtree.erase_and_destroy(k,
KeyNodeCompare(value_comp()), Destroyer(*this)); }
+ { return this->m_irbtree.erase_and_dispose(k,
KeyNodeCompare(value_comp()), Destroyer(*this)); }
iterator erase(const_iterator first, const_iterator last)
- { return iterator(this->m_irbtree.erase_and_destroy(first.get(),
last.get(), Destroyer(*this))); }
+ { return iterator(this->m_irbtree.erase_and_dispose(first.get(),
last.get(), Destroyer(*this))); }
void clear()
- { this->m_irbtree.clear_and_destroy(Destroyer(*this)); }
+ { this->m_irbtree.clear_and_dispose(Destroyer(*this)); }
// set operations:
iterator find(const key_type& k)
-------------------------------------------------------------------------
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
