diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-08 21:46:16 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-08 21:46:16 +0000 |
| commit | bb4bf88c4cd66e1393b771e1c628e03f8718f4d2 (patch) | |
| tree | 56a487c2d5c324338e2eaf003172baf05b94024d /libstdc++-v3/include/bits/stl_set.h | |
| parent | 7deddfded2d013c07a639873a4c90bfed40fd03e (diff) | |
| download | gcc-bb4bf88c4cd66e1393b771e1c628e03f8718f4d2.tar.gz | |
2010-11-08 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 166453
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@166454 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/stl_set.h')
| -rw-r--r-- | libstdc++-v3/include/bits/stl_set.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index ce5bc6c15f2..211b67e1960 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -429,7 +429,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); } /** @@ -472,10 +476,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * This function erases an element, pointed to by the given iterator, * from a %set. Note that this function only erases the element, and * that if the element is itself a pointer, the pointed-to memory is not - * touched in any way. Managing the pointer is the user's responsibility. + * touched in any way. Managing the pointer is the user's + * responsibility. */ iterator - erase(iterator __position) + erase(const_iterator __position) { return _M_t.erase(__position); } #else /** @@ -485,7 +490,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * This function erases an element, pointed to by the given iterator, * from a %set. Note that this function only erases the element, and * that if the element is itself a pointer, the pointed-to memory is not - * touched in any way. Managing the pointer is the user's responsibility. + * touched in any way. Managing the pointer is the user's + * responsibility. */ void erase(iterator __position) @@ -523,7 +529,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 /** |