forked from boostorg/intrusive
Merge from trunk for 1.38
[SVN r50332]
This commit is contained in:
1 parent
883a8bd0cc
commit
cb66b9cd97
51 files changed
+5918
-348
No files matched your search
@@ -1,7 +1,7 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// (C) Copyright Olaf Krzikalla 2004-2006.
|
||||
// (C) Copyright Ion Gaztanaga 2006-2007
|
||||
// (C) Copyright Ion Gaztanaga 2006-2008
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
@@ -235,7 +235,7 @@ class unordered_set_impl
|
||||
key_equal key_eq() const
|
||||
{ return table_.key_eq(); }
|
||||
|
||||
//! <b>Effects</b>: Returns true is the container is empty.
|
||||
//! <b>Effects</b>: Returns true if the container is empty.
|
||||
//!
|
||||
//! <b>Complexity</b>: if constant-time size and cache_last options are disabled,
|
||||
//! average constant time (worst case, with empty() == true: O(this->bucket_count()).
|
||||
@@ -463,6 +463,12 @@ class unordered_set_impl
|
||||
iterator erase_and_dispose(const_iterator i, Disposer disposer)
|
||||
{ return table_.erase_and_dispose(i, disposer); }
|
||||
|
||||
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
|
||||
template<class Disposer>
|
||||
iterator erase_and_dispose(iterator i, Disposer disposer)
|
||||
{ return this->erase_and_dispose(const_iterator(i), disposer); }
|
||||
#endif
|
||||
|
||||
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
|
||||
//!
|
||||
//! <b>Effects</b>: Erases the range pointed to by b end e.
|
||||
@@ -1288,7 +1294,7 @@ class unordered_multiset_impl
|
||||
key_equal key_eq() const
|
||||
{ return table_.key_eq(); }
|
||||
|
||||
//! <b>Effects</b>: Returns true is the container is empty.
|
||||
//! <b>Effects</b>: Returns true if the container is empty.
|
||||
//!
|
||||
//! <b>Complexity</b>: if constant-time size and cache_last options are disabled,
|
||||
//! average constant time (worst case, with empty() == true: O(this->bucket_count()).
|
||||
@@ -1453,6 +1459,12 @@ class unordered_multiset_impl
|
||||
void erase_and_dispose(const_iterator i, Disposer disposer)
|
||||
{ table_.erase_and_dispose(i, disposer); }
|
||||
|
||||
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
|
||||
template<class Disposer>
|
||||
iterator erase_and_dispose(iterator i, Disposer disposer)
|
||||
{ return this->erase_and_dispose(const_iterator(i), disposer); }
|
||||
#endif
|
||||
|
||||
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
|
||||
//!
|
||||
//! <b>Effects</b>: Erases the range pointed to by b end e.
|
||||
|
||||
Reference in new issue
Block a user