diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-08 16:07:32 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-08 16:07:32 +0000 |
| commit | 3b607c40172630028ad89adfc51536b1387f63bc (patch) | |
| tree | aab9c7af7885b649144d762d73e89592cb94b93a /libstdc++-v3/include/bits/stl_map.h | |
| parent | df793dca208cdfd2d2870b08d751705659798f33 (diff) | |
| download | ppe42-gcc-3b607c40172630028ad89adfc51536b1387f63bc.tar.gz ppe42-gcc-3b607c40172630028ad89adfc51536b1387f63bc.zip | |
2010-11-08 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_tree.h (_Rb_tree<>::_M_erase_aux): Add.
(_Rb_tree<>::erase(iterator)): Fix in C++0x mode to take
const_iterator; remove redundant overload in C++03 mode.
(_Rb_tree<>::erase(iterator, iterator)): Likewise.
* include/bits/stl_map.h (map<>::erase): Adjust.
(map<>::insert): Fix signature in C++0x mode.
* include/bits/stl_set.h (set<>::erase): Likewise.
(set<>::insert): Likewise.
* include/bits/stl_multimap.h (multimap<>::erase): Likewise.
(multimap<>::insert): Likewise.
* include/bits/stl_multiset.h (multiset<>::erase): Likewise.
(multiset<>::insert): Fix signature in C++0x mode.
* include/profile/set.h: Adjust.
* include/profile/multiset.h: Likewise.
* include/profile/map.h: Likewise.
* include/profile/multimap.h: Likewise.
* testsuite/util/exception/safety.h (erase_base, insert_base):
Update.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166438 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/stl_map.h')
| -rw-r--r-- | libstdc++-v3/include/bits/stl_map.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 5d6a98b75b2..9614a12f106 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -510,7 +510,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) */ void insert(std::initializer_list<value_type> __list) - { insert (__list.begin(), __list.end()); } + { insert(__list.begin(), __list.end()); } #endif /** @@ -537,7 +537,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * Insertion requires logarithmic time (if the hint is not taken). */ iterator +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + insert(const_iterator __position, const value_type& __x) +#else insert(iterator __position, const value_type& __x) +#endif { return _M_t._M_insert_unique_(__position, __x); } /** @@ -570,7 +574,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * the pointer is the user's responsibility. */ iterator - erase(iterator __position) + erase(const_iterator __position) { return _M_t.erase(__position); } #else /** @@ -619,7 +623,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * in any way. Managing the pointer is the user's responsibility. */ iterator - erase(iterator __first, iterator __last) + erase(const_iterator __first, const_iterator __last) { return _M_t.erase(__first, __last); } #else /** |
