diff options
Diffstat (limited to 'libstdc++-v3/include/bits/stl_multiset.h')
| -rw-r--r-- | libstdc++-v3/include/bits/stl_multiset.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index 2448742356a..4ac650a7ca2 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -58,7 +58,7 @@ #define _STL_MULTISET_H 1 #include <bits/concept_check.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -190,7 +190,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER multiset(const multiset& __x) : _M_t(__x._M_t) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Multiset move constructor. * @param __x A %multiset of identical element and allocator types. @@ -233,7 +233,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Multiset move assignment operator. * @param __x A %multiset of identical element and allocator types. @@ -323,7 +323,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER rend() const _GLIBCXX_NOEXCEPT { return _M_t.rend(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read-only (constant) iterator that points to the first * element in the %multiset. Iteration is done in ascending order @@ -392,7 +392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { _M_t.swap(__x._M_t); } // insert/erase -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Builds and inserts an element into the %multiset. * @param __args Arguments used to generate the element instance to be @@ -455,7 +455,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(const value_type& __x) { return _M_t._M_insert_equal(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L iterator insert(value_type&& __x) { return _M_t._M_insert_equal(std::move(__x)); } @@ -485,7 +485,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(const_iterator __position, const value_type& __x) { return _M_t._M_insert_equal_(__position, __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L iterator insert(const_iterator __position, value_type&& __x) { return _M_t._M_insert_equal_(__position, std::move(__x)); } @@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(_InputIterator __first, _InputIterator __last) { _M_t._M_insert_equal(__first, __last); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Attempts to insert a list of elements into the %multiset. * @param __l A std::initializer_list<value_type> of elements @@ -517,7 +517,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { this->insert(__l.begin(), __l.end()); } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS // DR 130. Associative erase should return an iterator. /** @@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER erase(const key_type& __x) { return _M_t.erase(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS // DR 130. Associative erase should return an iterator. /** |