diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-14 18:41:01 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-14 18:41:01 +0000 |
| commit | b3bea0f2c5c7bf1eb40ef0861e58ad4827a0ae3f (patch) | |
| tree | fcb23e8bb645ab48cfb497aef32b65dbdf8d822d /libstdc++-v3/include/debug/multiset.h | |
| parent | 55a2a0a387078fca46ea83533606c99121e5156b (diff) | |
| download | gcc-b3bea0f2c5c7bf1eb40ef0861e58ad4827a0ae3f.tar.gz | |
2010-11-14 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_tree.h (_Rb_tree<>::_M_const_cast_iter): Remove.
(_Rb_tree_const_iterator<>::_M_const_cast): Add.
(_Rb_tree<>::erase, _M_insert_unique_): Adjust.
* include/debug/map.h (map<>::erase, insert): Fix C++0x signatures.
* include/debug/multimap.h (multimap<>::erase, insert): Likewise.
* include/debug/set.h (set<>::erase, insert): Fix, only cosmetic
changes in this case.
* include/debug/multiset.h (multiset<>::erase, insert): Likewise.
* include/profile/set.h (set<>::insert): Remove redundant macro.
* include/profile/multiset.h (multiset<>::insert): Likewise.
* include/bits/stl_set.h (set<>::insert): Likewise.
* include/bits/stl_multiset.h (multiset<>::insert): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166734 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug/multiset.h')
| -rw-r--r-- | libstdc++-v3/include/debug/multiset.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h index 76300cd8829..9c950a1d0c2 100644 --- a/libstdc++-v3/include/debug/multiset.h +++ b/libstdc++-v3/include/debug/multiset.h @@ -201,7 +201,7 @@ namespace __debug #endif iterator - insert(iterator __position, const value_type& __x) + insert(const_iterator __position, const value_type& __x) { __glibcxx_check_insert(__position); return iterator(_Base::insert(__position.base(), __x), this); @@ -234,7 +234,7 @@ namespace __debug #ifdef __GXX_EXPERIMENTAL_CXX0X__ iterator - erase(iterator __position) + erase(const_iterator __position) { __glibcxx_check_erase(__position); __position._M_invalidate(); @@ -267,14 +267,14 @@ namespace __debug #ifdef __GXX_EXPERIMENTAL_CXX0X__ iterator - erase(iterator __first, iterator __last) + erase(const_iterator __first, const_iterator __last) { // _GLIBCXX_RESOLVE_LIB_DEFECTS // 151. can't currently clear() empty container __glibcxx_check_erase_range(__first, __last); while (__first != __last) this->erase(__first++); - return __last; + return __last; // iterator == const_iterator } #else void |