diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-10 17:27:22 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-10 17:27:22 +0000 |
| commit | 0c8766b14373cdc13b9c966130ec877e0fa29865 (patch) | |
| tree | d9b336f73d8705f567b8e2871708f2dca7cadb44 /libstdc++-v3/include/bits | |
| parent | f955ca518bf9bfa53aabe55c11a67c6c5a2a3581 (diff) | |
| download | gcc-0c8766b14373cdc13b9c966130ec877e0fa29865.tar.gz | |
* many: Replace uses of __GXX_EXPERIMENTAL_CXX0X__ with __cplusplus.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193392 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits')
42 files changed, 300 insertions, 300 deletions
diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index fbec55d0c36..856a8d94860 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -35,7 +35,7 @@ #include <bits/c++config.h> #include <bits/stl_pair.h> #include <bits/stl_iterator_base_types.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -190,7 +190,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // adjacent_find -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _IIter, typename _Predicate> bool all_of(_IIter, _IIter, _Predicate); @@ -216,7 +216,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _BIter2 copy_backward(_BIter1, _BIter1, _BIter2); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _IIter, typename _OIter, typename _Predicate> _OIter copy_if(_IIter, _IIter, _OIter, _Predicate); @@ -258,7 +258,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // find_first_of // find_if -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _IIter, typename _Predicate> _IIter find_if_not(_IIter, _IIter, _Predicate); @@ -284,7 +284,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void inplace_merge(_BIter, _BIter, _BIter, _Compare); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _RAIter> bool is_heap(_RAIter, _RAIter); @@ -372,7 +372,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // min_element -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp> pair<const _Tp&, const _Tp&> minmax(const _Tp&, const _Tp&); @@ -424,7 +424,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool next_permutation(_BIter, _BIter, _Compare); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _IIter, typename _Predicate> bool none_of(_IIter, _IIter, _Predicate); @@ -443,7 +443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // partition -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _IIter, typename _OIter1, typename _OIter2, typename _Predicate> pair<_OIter1, _OIter2> @@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // set_symmetric_difference // set_union -#if defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(_GLIBCXX_USE_C99_STDINT_TR1) +#if (__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99_STDINT_TR1) template<typename _RAIter, typename _UGenerator> void shuffle(_RAIter, _RAIter, _UGenerator&&); @@ -552,7 +552,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp> void swap(_Tp&, _Tp&) -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L noexcept(__and_<is_nothrow_move_constructible<_Tp>, is_nothrow_move_assignable<_Tp>>::value) #endif @@ -561,7 +561,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp, size_t _Nm> void swap(_Tp (&__a)[_Nm], _Tp (&__b)[_Nm]) -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L noexcept(noexcept(swap(*__a, *__b))) #endif ; @@ -714,7 +714,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO template<typename _RAIter, typename _Generator> void random_shuffle(_RAIter, _RAIter, -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Generator&&); #else _Generator&); diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h index 80cc956a6fb..9abadbb77ce 100644 --- a/libstdc++-v3/include/bits/alloc_traits.h +++ b/libstdc++-v3/include/bits/alloc_traits.h @@ -30,7 +30,7 @@ #ifndef _ALLOC_TRAITS_H #define _ALLOC_TRAITS_H 1 -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <bits/ptr_traits.h> #include <ext/numeric_traits.h> diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index 49ba0b5be4f..0989ad88cf0 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -188,7 +188,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return __one != __two; } }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, bool = __or_<is_copy_constructible<typename _Tp::value_type>, is_nothrow_move_constructible<typename _Tp::value_type>>::value> diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 24562c462b8..1e3426680fc 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -40,7 +40,7 @@ #include <ext/atomicity.h> #include <debug/debug.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -498,7 +498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ basic_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc()); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Move construct string. * @param __str Source string. @@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @param __a Allocator to use (default is default allocator). */ basic_string(initializer_list<_CharT> __l, const _Alloc& __a = _Alloc()); -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Construct string as copy of a range. @@ -570,7 +570,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Move assign the value of @a str to this string. * @param __str Source string. @@ -596,7 +596,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION this->assign(__l.begin(), __l.size()); return *this; } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 // Iterators: /** @@ -673,7 +673,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION rend() const _GLIBCXX_NOEXCEPT { return const_reverse_iterator(this->begin()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read-only (constant) iterator that points to the first * character in the %string. @@ -755,7 +755,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION resize(size_type __n) { this->resize(__n, _CharT()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// A non-binding request to reduce capacity() to size(). void shrink_to_fit() @@ -890,7 +890,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return _M_data()[__n]; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read/write reference to the data at the first * element of the %string. @@ -955,7 +955,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Append an initializer_list of characters. * @param __l The initializer_list of characters to be appended. @@ -964,7 +964,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string& operator+=(initializer_list<_CharT> __l) { return this->append(__l.begin(), __l.size()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Append a string to this string. @@ -1022,7 +1022,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string& append(size_type __n, _CharT __c); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Append an initializer_list of characters. * @param __l The initializer_list of characters to append. @@ -1031,7 +1031,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string& append(initializer_list<_CharT> __l) { return this->append(__l.begin(), __l.size()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Append a range of characters. @@ -1068,7 +1068,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string& assign(const basic_string& __str); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Set value to contents of another string. * @param __str Source string to use. @@ -1083,7 +1083,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION this->swap(__str); return *this; } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Set value to a substring of a string. @@ -1159,7 +1159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION assign(_InputIterator __first, _InputIterator __last) { return this->replace(_M_ibegin(), _M_iend(), __first, __last); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Set value to an initializer_list of characters. * @param __l The initializer_list of characters to assign. @@ -1168,7 +1168,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string& assign(initializer_list<_CharT> __l) { return this->assign(__l.begin(), __l.size()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Insert multiple characters. @@ -1204,7 +1204,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION insert(iterator __p, _InputIterator __beg, _InputIterator __end) { this->replace(__p, __p, __beg, __end); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Insert an initializer_list of characters. * @param __p Iterator referencing location in string to insert at. @@ -1217,7 +1217,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend()); this->insert(__p - _M_ibegin(), __l.begin(), __l.size()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Insert value of a string. @@ -1399,7 +1399,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION iterator erase(iterator __first, iterator __last); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Remove the last character. * @@ -1408,7 +1408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void pop_back() { erase(size()-1, 1); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Replace characters with value from another string. @@ -1676,7 +1676,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __k1.base(), __k2 - __k1); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Replace range of characters with initializer_list. * @param __i1 Iterator referencing start of range to replace. @@ -1694,7 +1694,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string& replace(iterator __i1, iterator __i2, initializer_list<_CharT> __l) { return this->replace(__i1, __i2, __l.begin(), __l.end()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 private: template<class _Integer> @@ -2426,7 +2426,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __str; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _CharT, typename _Traits, typename _Alloc> inline basic_string<_CharT, _Traits, _Alloc> operator+(basic_string<_CharT, _Traits, _Alloc>&& __lhs, @@ -2813,7 +2813,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(_GLIBCXX_USE_C99) \ +#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) #include <ext/string_conversions.h> @@ -3030,9 +3030,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#endif /* __GXX_EXPERIMENTAL_CXX0X__ && _GLIBCXX_USE_C99 ... */ +#endif /* C++11 && _GLIBCXX_USE_C99 ... */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <bits/functional_hash.h> @@ -3094,6 +3094,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#endif /* __GXX_EXPERIMENTAL_CXX0X__ */ +#endif // C++11 #endif /* _BASIC_STRING_H */ diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 7eff81819f6..726ae6dfbf1 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -231,7 +231,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_dataplus(_S_construct(__beg, __end, __a), __a) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _CharT, typename _Traits, typename _Alloc> basic_string<_CharT, _Traits, _Alloc>:: basic_string(initializer_list<_CharT> __l, const _Alloc& __a) diff --git a/libstdc++-v3/include/bits/c++0x_warning.h b/libstdc++-v3/include/bits/c++0x_warning.h index eb072d00a45..7dc00a1bc06 100644 --- a/libstdc++-v3/include/bits/c++0x_warning.h +++ b/libstdc++-v3/include/bits/c++0x_warning.h @@ -28,7 +28,7 @@ #ifndef _CXX0X_WARNING_H #define _CXX0X_WARNING_H 1 -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L #error This file requires compiler and library support for the \ ISO C++ 2011 standard. This support is currently experimental, and must be \ enabled with the -std=c++11 or -std=gnu++11 compiler options. diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index aba931b08cc..279df04d82f 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -78,7 +78,7 @@ # define _GLIBCXX_USE_DEPRECATED 1 #endif -#if defined(__DEPRECATED) && defined(__GXX_EXPERIMENTAL_CXX0X__) +#if defined(__DEPRECATED) && (__cplusplus >= 201103L) # define _GLIBCXX_DEPRECATED __attribute__ ((__deprecated__)) #else # define _GLIBCXX_DEPRECATED @@ -88,7 +88,7 @@ // Macro for constexpr, to support in mixed 03/0x mode. #ifndef _GLIBCXX_CONSTEXPR -# ifdef __GXX_EXPERIMENTAL_CXX0X__ +# if __cplusplus >= 201103L # define _GLIBCXX_CONSTEXPR constexpr # define _GLIBCXX_USE_CONSTEXPR constexpr # else @@ -99,7 +99,7 @@ // Macro for noexcept, to support in mixed 03/0x mode. #ifndef _GLIBCXX_NOEXCEPT -# ifdef __GXX_EXPERIMENTAL_CXX0X__ +# if __cplusplus >= 201103L # define _GLIBCXX_NOEXCEPT noexcept # define _GLIBCXX_USE_NOEXCEPT noexcept # define _GLIBCXX_THROW(_EXC) @@ -180,7 +180,7 @@ namespace std typedef __SIZE_TYPE__ size_t; typedef __PTRDIFF_TYPE__ ptrdiff_t; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L typedef decltype(nullptr) nullptr_t; #endif } diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 2024a333229..db6862a0146 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -372,7 +372,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) \ +#if ((__cplusplus >= 201103L) \ && defined(_GLIBCXX_USE_C99_STDINT_TR1)) #include <cstdint> diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h index 166890fb8fd..ed856e9c354 100644 --- a/libstdc++-v3/include/bits/cpp_type_traits.h +++ b/libstdc++-v3/include/bits/cpp_type_traits.h @@ -180,7 +180,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; # endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<> struct __is_integer<char16_t> { @@ -407,7 +407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef __false_type __type; }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Iterator> class move_iterator; diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc index fcece60c8bb..6f987199a67 100644 --- a/libstdc++-v3/include/bits/deque.tcc +++ b/libstdc++-v3/include/bits/deque.tcc @@ -62,7 +62,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_CONTAINER -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template <typename _Tp, typename _Alloc> void deque<_Tp, _Alloc>:: @@ -110,7 +110,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> template<typename... _Args> void @@ -166,7 +166,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return _M_insert_aux(__position, __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> template<typename... _Args> typename deque<_Tp, _Alloc>::iterator @@ -303,7 +303,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_insert_aux(__pos, __n, __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template <typename _Tp, typename _Alloc> void deque<_Tp, _Alloc>:: @@ -430,7 +430,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // Called only if _M_impl._M_finish._M_cur == _M_impl._M_finish._M_last - 1. template<typename _Tp, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename... _Args> void deque<_Tp, _Alloc>:: @@ -445,7 +445,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER *(this->_M_impl._M_finish._M_node + 1) = this->_M_allocate_node(); __try { -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L this->_M_impl.construct(this->_M_impl._M_finish._M_cur, std::forward<_Args>(__args)...); #else @@ -464,7 +464,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // Called only if _M_impl._M_start._M_cur == _M_impl._M_start._M_first. template<typename _Tp, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename... _Args> void deque<_Tp, _Alloc>:: @@ -482,7 +482,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER this->_M_impl._M_start._M_set_node(this->_M_impl._M_start._M_node - 1); this->_M_impl._M_start._M_cur = this->_M_impl._M_start._M_last - 1; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L this->_M_impl.construct(this->_M_impl._M_start._M_cur, std::forward<_Args>(__args)...); #else @@ -579,7 +579,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } template<typename _Tp, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename... _Args> typename deque<_Tp, _Alloc>::iterator deque<_Tp, _Alloc>:: @@ -996,7 +996,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return __result; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp> _Deque_iterator<_Tp, _Tp&, _Tp*> move(_Deque_iterator<_Tp, const _Tp&, const _Tp*> __first, diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index 9efabcf953a..dcd3fccd3b8 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -33,7 +33,7 @@ #pragma GCC system_header #include <memory> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif diff --git a/libstdc++-v3/include/bits/list.tcc b/libstdc++-v3/include/bits/list.tcc index 727e82d3d8d..066d16011a9 100644 --- a/libstdc++-v3/include/bits/list.tcc +++ b/libstdc++-v3/include/bits/list.tcc @@ -72,7 +72,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { _Node* __tmp = __cur; __cur = static_cast<_Node*>(__cur->_M_next); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_get_Node_allocator().destroy(__tmp); #else _M_get_Tp_allocator().destroy(std::__addressof(__tmp->_M_data)); @@ -81,7 +81,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> template<typename... _Args> typename list<_Tp, _Alloc>::iterator @@ -114,7 +114,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return __ret; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> void list<_Tp, _Alloc>:: @@ -285,7 +285,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER template<typename _Tp, typename _Alloc> void list<_Tp, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L merge(list&& __x) #else merge(list& __x) @@ -319,7 +319,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER template <typename _StrictWeakOrdering> void list<_Tp, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L merge(list&& __x, _StrictWeakOrdering __comp) #else merge(list& __x, _StrictWeakOrdering __comp) diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h index 236f0de300a..c19e0b0fe2c 100644 --- a/libstdc++-v3/include/bits/move.h +++ b/libstdc++-v3/include/bits/move.h @@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <type_traits> // Brings in std::declval too. namespace std _GLIBCXX_VISIBILITY(default) @@ -164,7 +164,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp> inline void swap(_Tp& __a, _Tp& __b) -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L noexcept(__and_<is_nothrow_move_constructible<_Tp>, is_nothrow_move_assignable<_Tp>>::value) #endif @@ -183,7 +183,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp, size_t _Nm> inline void swap(_Tp (&__a)[_Nm], _Tp (&__b)[_Nm]) -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L noexcept(noexcept(swap(*__a, *__b))) #endif { diff --git a/libstdc++-v3/include/bits/postypes.h b/libstdc++-v3/include/bits/postypes.h index 69235d9a099..71492a543a2 100644 --- a/libstdc++-v3/include/bits/postypes.h +++ b/libstdc++-v3/include/bits/postypes.h @@ -231,7 +231,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// File position for wchar_t streams. typedef fpos<mbstate_t> wstreampos; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// File position for char16_t streams. typedef fpos<mbstate_t> u16streampos; /// File position for char32_t streams. diff --git a/libstdc++-v3/include/bits/ptr_traits.h b/libstdc++-v3/include/bits/ptr_traits.h index 552f48745f3..33db837c620 100644 --- a/libstdc++-v3/include/bits/ptr_traits.h +++ b/libstdc++-v3/include/bits/ptr_traits.h @@ -30,7 +30,7 @@ #ifndef _PTR_TRAITS_H #define _PTR_TRAITS_H 1 -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <type_traits> // For _GLIBCXX_HAS_NESTED_TYPE diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h index e1b83bfcfca..adfe4509128 100644 --- a/libstdc++-v3/include/bits/range_access.h +++ b/libstdc++-v3/include/bits/range_access.h @@ -32,7 +32,7 @@ #pragma GCC system_header -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L namespace std _GLIBCXX_VISIBILITY(default) { @@ -100,6 +100,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif // _GLIBCXX_RANGE_ACCESS_H diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index f337e0c07a6..bd513b3b540 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -63,7 +63,7 @@ #include <bits/stl_heap.h> #include <bits/stl_tempbuf.h> // for _Temporary_buffer -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <random> // for std::uniform_int_distribution #include <functional> // for std::bind #endif @@ -737,7 +737,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __comp); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Checks that a predicate is true for all the elements * of a sequence. @@ -954,7 +954,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __result; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Copy the elements of a sequence for which a predicate is true. * @ingroup mutating_algorithms @@ -3964,7 +3964,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __result; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Determines whether the elements of a sequence are sorted. * @ingroup sorting_algorithms @@ -4413,7 +4413,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 _GLIBCXX_END_NAMESPACE_VERSION @@ -5238,7 +5238,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO template<typename _RandomAccessIterator, typename _RandomNumberGenerator> void random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last, -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _RandomNumberGenerator&& __rand) #else _RandomNumberGenerator& __rand) diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index fe30f6ce9f5..54636e53565 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -74,7 +74,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L // See http://gcc.gnu.org/ml/libstdc++/2004-08/msg00167.html: in a // nutshell, we are partially implementing the resolution of DR 187, // when it's safe, i.e., the value_types are equal. @@ -125,7 +125,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __glibcxx_function_requires(_Mutable_ForwardIteratorConcept< _ForwardIterator2>) -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L typedef typename iterator_traits<_ForwardIterator1>::value_type _ValueType1; typedef typename iterator_traits<_ForwardIterator2>::value_type @@ -308,7 +308,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Category> struct __copy_move<true, false, _Category> { @@ -341,7 +341,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<> struct __copy_move<true, false, random_access_iterator_tag> { @@ -461,7 +461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __result)); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Moves the range [first,last) into result. * @ingroup mutating_algorithms @@ -511,7 +511,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Category> struct __copy_move_backward<true, false, _Category> { @@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<> struct __copy_move_backward<true, false, random_access_iterator_tag> { @@ -632,7 +632,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __result)); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Moves the range [first,last) into result. * @ingroup mutating_algorithms diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index b8d3efbf651..92265cf23d9 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -57,7 +57,7 @@ #ifndef _STL_BVECTOR_H #define _STL_BVECTOR_H 1 -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -108,7 +108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { *_M_p ^= _M_mask; } }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L inline void swap(_Bit_reference __x, _Bit_reference __y) noexcept { @@ -421,7 +421,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _Bit_alloc_type(__a), _M_start(), _M_finish(), _M_end_of_storage(0) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Bvector_impl(_Bit_alloc_type&& __a) : _Bit_alloc_type(std::move(__a)), _M_start(), _M_finish(), _M_end_of_storage(0) @@ -450,7 +450,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Bvector_base(const allocator_type& __a) : _M_impl(__a) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Bvector_base(_Bvector_base&& __x) noexcept : _M_impl(std::move(__x._M_get_Bit_allocator())) { @@ -520,7 +520,7 @@ template<typename _Alloc> { typedef _Bvector_base<_Alloc> _Base; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename> friend class hash; #endif @@ -555,7 +555,7 @@ template<typename _Alloc> vector(const allocator_type& __a) : _Base(__a) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L explicit vector(size_type __n, const allocator_type& __a = allocator_type()) : vector(__n, false, __a) @@ -588,7 +588,7 @@ template<typename _Alloc> _M_copy_aligned(__x.begin(), __x.end(), this->_M_impl._M_start); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L vector(vector&& __x) noexcept : _Base(std::move(__x)) { } @@ -601,7 +601,7 @@ template<typename _Alloc> } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> vector(_InputIterator __first, _InputIterator __last, @@ -636,7 +636,7 @@ template<typename _Alloc> return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L vector& operator=(vector&& __x) { @@ -663,7 +663,7 @@ template<typename _Alloc> assign(size_type __n, const bool& __x) { _M_fill_assign(__n, __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> void @@ -679,7 +679,7 @@ template<typename _Alloc> } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void assign(initializer_list<bool> __l) { this->assign(__l.begin(), __l.end()); } @@ -717,7 +717,7 @@ template<typename _Alloc> rend() const _GLIBCXX_NOEXCEPT { return const_reverse_iterator(begin()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L const_iterator cbegin() const noexcept { return this->_M_impl._M_start; } @@ -867,7 +867,7 @@ template<typename _Alloc> return begin() + __n; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> void @@ -889,7 +889,7 @@ template<typename _Alloc> insert(iterator __position, size_type __n, const bool& __x) { _M_fill_insert(__position, __n, __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void insert(iterator __p, initializer_list<bool> __l) { this->insert(__p, __l.begin(), __l.end()); } #endif @@ -924,7 +924,7 @@ template<typename _Alloc> insert(end(), __new_size - size(), __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void shrink_to_fit() { _M_shrink_to_fit(); } @@ -966,7 +966,7 @@ template<typename _Alloc> void _M_reallocate(size_type __n); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L bool _M_shrink_to_fit(); #endif @@ -1130,7 +1130,7 @@ template<typename _Alloc> _GLIBCXX_END_NAMESPACE_CONTAINER } // namespace std -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <bits/functional_hash.h> @@ -1151,6 +1151,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION }// namespace std -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h index 8aaaab80575..bb74a9cf464 100644 --- a/libstdc++-v3/include/bits/stl_construct.h +++ b/libstdc++-v3/include/bits/stl_construct.h @@ -70,7 +70,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Constructs an object in existing memory by invoking an allocated * object's constructor with an initializer. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _T1, typename... _Args> inline void _Construct(_T1* __p, _Args&&... __args) diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 157df3ba30a..2a135463974 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -60,7 +60,7 @@ #include <bits/concept_check.h> #include <bits/stl_iterator_base_types.h> #include <bits/stl_iterator_base_funcs.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -392,7 +392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER const _Tp&, const _Tp*>(__last), __result); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp> _Deque_iterator<_Tp, _Tp&, _Tp*> move(_Deque_iterator<_Tp, const _Tp&, const _Tp*>, @@ -465,7 +465,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _M_impl(__a) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Deque_base(_Deque_base&& __x) : _M_impl(std::move(__x._M_get_Tp_allocator())) { @@ -508,7 +508,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_start(), _M_finish() { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Deque_impl(_Tp_alloc_type&& __a) : _Tp_alloc_type(std::move(__a)), _M_map(0), _M_map_size(0), _M_start(), _M_finish() @@ -791,7 +791,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER deque(const allocator_type& __a) : _Base(__a, 0) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Creates a %deque with default constructed elements. * @param __n The number of elements to initially create. @@ -845,7 +845,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER this->_M_impl._M_start, _M_get_Tp_allocator()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Deque move constructor. * @param __x A %deque of identical element and allocator types. @@ -891,7 +891,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * input iterators are used, then this will do at most 2N calls to the * copy constructor, and logN memory reallocations. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> deque(_InputIterator __first, _InputIterator __last, @@ -928,7 +928,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER deque& operator=(const deque& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Deque move assignment operator. * @param __x A %deque of identical element and allocator types. @@ -991,7 +991,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * resulting %deque's size is the same as the number of elements * assigned. Old data may be lost. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> void @@ -1007,7 +1007,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Assigns an initializer list to a %deque. * @param __l An initializer_list. @@ -1100,7 +1100,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER rend() const _GLIBCXX_NOEXCEPT { return const_reverse_iterator(this->_M_impl._M_start); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read-only (constant) iterator that points to the first * element in the %deque. Iteration is done in ordinary element order. @@ -1148,7 +1148,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER max_size() const _GLIBCXX_NOEXCEPT { return _M_get_Tp_allocator().max_size(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Resizes the %deque to the specified number of elements. * @param __new_size Number of elements the %deque should contain. @@ -1214,7 +1214,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** A non-binding request to reduce memory use. */ void shrink_to_fit() @@ -1368,7 +1368,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_push_front_aux(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push_front(value_type&& __x) { emplace_front(std::move(__x)); } @@ -1400,7 +1400,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_push_back_aux(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push_back(value_type&& __x) { emplace_back(std::move(__x)); } @@ -1452,7 +1452,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_pop_back_aux(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Inserts an object in %deque before specified iterator. * @param __position An iterator into the %deque. @@ -1479,7 +1479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator insert(iterator __position, const value_type& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Inserts given rvalue into %deque before specified iterator. * @param __position An iterator into the %deque. @@ -1530,7 +1530,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * [__first,__last) into the %deque before the location specified * by @a __position. This is known as <em>range insert</em>. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> void @@ -1680,7 +1680,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER void _M_fill_initialize(const value_type& __value); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // called by deque(n). void _M_default_initialize(); @@ -1752,7 +1752,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER //@{ /// Helper functions for push_* and pop_*. -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L void _M_push_back_aux(const value_type&); void _M_push_front_aux(const value_type&); @@ -1813,7 +1813,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_fill_insert(iterator __pos, size_type __n, const value_type& __x); // called by insert(p,x) -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L iterator _M_insert_aux(iterator __pos, const value_type& __x); #else @@ -1874,7 +1874,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER this->_M_impl._M_finish = __pos; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // Called by resize(sz). void _M_default_append(size_type __n); diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h index 42f5c1752b7..f94216bcd4d 100644 --- a/libstdc++-v3/include/bits/stl_function.h +++ b/libstdc++-v3/include/bits/stl_function.h @@ -496,7 +496,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator()(const _Pair& __x) const { return __x.first; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Pair2> typename _Pair2::first_type& operator()(_Pair2& __x) const @@ -729,7 +729,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED +#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED # include <backward/binders.h> #endif diff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h index f185610d9e0..191da90c92f 100644 --- a/libstdc++-v3/include/bits/stl_heap.h +++ b/libstdc++-v3/include/bits/stl_heap.h @@ -502,7 +502,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Search the end of a heap. * @param __first Start of range. diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 100d30e300a..14371bc8203 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -375,7 +375,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return !(__x < __y); } template<typename _IteratorL, typename _IteratorR> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // DR 685. inline auto operator-(const reverse_iterator<_IteratorL>& __x, @@ -426,7 +426,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * the end, if you like). Assigning a value to the %iterator will * always append the value to the end of the container. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L back_insert_iterator& operator=(typename _Container::const_reference __value) { @@ -516,7 +516,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * the front, if you like). Assigning a value to the %iterator will * always prepend the value to the front of the container. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L front_insert_iterator& operator=(typename _Container::const_reference __value) { @@ -627,7 +627,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * // vector v contains A, 1, 2, 3, and Z * @endcode */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L insert_iterator& operator=(typename _Container::const_reference __value) { @@ -880,7 +880,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // operators but also operator- must accept mixed iterator/const_iterator // parameters. template<typename _IteratorL, typename _IteratorR, typename _Container> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // DR 685. inline auto operator-(const __normal_iterator<_IteratorL, _Container>& __lhs, @@ -908,7 +908,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L namespace std _GLIBCXX_VISIBILITY(default) { @@ -1145,6 +1145,6 @@ _GLIBCXX_END_NAMESPACE_VERSION #else #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) (_Iter) #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) (_Iter) -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h index 808f5d94c56..43313aed439 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h @@ -177,7 +177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::__advance(__i, __d, std::__iterator_category(__i)); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _ForwardIterator> inline _ForwardIterator @@ -197,7 +197,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __x; } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h index 1f56c061df5..70e892c4f44 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_types.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h @@ -65,7 +65,7 @@ #include <bits/c++config.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L # include <type_traits> // For _GLIBCXX_HAS_NESTED_TYPE, is_convertible #endif @@ -139,7 +139,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * argument. Specialized versions for pointers and pointers-to-const * provide tighter, more correct semantics. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _GLIBCXX_HAS_NESTED_TYPE(iterator_category) @@ -223,7 +223,7 @@ _GLIBCXX_HAS_NESTED_TYPE(iterator_category) { return __it.base(); } }; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InIter> using _RequireInputIter = typename enable_if<is_convertible<typename diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 5fdaec91d17..f67a091f192 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -58,7 +58,7 @@ #define _STL_LIST_H 1 #include <bits/concept_check.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -109,7 +109,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ///< User's data. _Tp _M_data; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename... _Args> _List_node(_Args&&... __args) : __detail::_List_node_base(), _M_data(std::forward<_Args>(__args)...) @@ -321,7 +321,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _Node_alloc_type(__a), _M_node() { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _List_impl(_Node_alloc_type&& __a) : _Node_alloc_type(std::move(__a)), _M_node() { } @@ -365,7 +365,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _M_impl(__a) { _M_init(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _List_base(_List_base&& __x) : _M_impl(std::move(__x._M_get_Node_allocator())) { @@ -478,7 +478,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * Allocates space for a new node and constructs a copy of * @a __args in it. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L _Node* _M_create_node(const value_type& __x) { @@ -532,7 +532,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER list(const allocator_type& __a) : _Base(_Node_alloc_type(__a)) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Creates a %list with default constructed elements. * @param __n The number of elements to initially create. @@ -584,7 +584,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _Base(__x._M_get_Node_allocator()) { _M_initialize_dispatch(__x.begin(), __x.end(), __false_type()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %List move constructor. * @param __x A %list of identical element and allocator types. @@ -619,7 +619,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * [@a __first,@a __last). This is linear in N (where N is * distance(@a __first,@a __last)). */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> list(_InputIterator __first, _InputIterator __last, @@ -656,7 +656,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER list& operator=(const list& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %List move assignment operator. * @param __x A %list of identical element and allocator types. @@ -715,7 +715,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * that the resulting %list's size is the same as the number of * elements assigned. Old data may be lost. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> void @@ -732,7 +732,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Assigns an initializer_list to a %list. * @param __l An initializer_list of value_type. @@ -822,7 +822,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER rend() const _GLIBCXX_NOEXCEPT { return const_reverse_iterator(begin()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read-only (constant) iterator that points to the * first element in the %list. Iteration is done in ordinary @@ -879,7 +879,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER max_size() const _GLIBCXX_NOEXCEPT { return _M_get_Node_allocator().max_size(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Resizes the %list to the specified number of elements. * @param __new_size Number of elements the %list should contain. @@ -975,7 +975,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER push_front(const value_type& __x) { this->_M_insert(begin(), __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push_front(value_type&& __x) { this->_M_insert(begin(), std::move(__x)); } @@ -1016,7 +1016,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER push_back(const value_type& __x) { this->_M_insert(end(), __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push_back(value_type&& __x) { this->_M_insert(end(), std::move(__x)); } @@ -1042,7 +1042,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER pop_back() { this->_M_erase(iterator(this->_M_impl._M_node._M_prev)); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Constructs object in %list before specified iterator. * @param __position A const_iterator into the %list. @@ -1074,7 +1074,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator insert(iterator __position, const value_type& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Inserts given rvalue into %list before specified iterator. * @param __position An iterator into the %list. @@ -1140,7 +1140,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * This operation is linear in the number of elements inserted and * does not invalidate iterators and references. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> #else @@ -1245,7 +1245,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * Requires this != @a __x. */ void -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L splice(iterator __position, list&& __x) #else splice(iterator __position, list& __x) @@ -1259,7 +1259,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void splice(iterator __position, list& __x) { splice(__position, std::move(__x)); } @@ -1275,7 +1275,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * inserts it into the current list before @a __position. */ void -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L splice(iterator __position, list&& __x, iterator __i) #else splice(iterator __position, list& __x, iterator __i) @@ -1292,7 +1292,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER this->_M_transfer(__position, __i, __j); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void splice(iterator __position, list& __x, iterator __i) { splice(__position, std::move(__x), __i); } @@ -1311,7 +1311,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * Undefined if @a __position is in [__first,__last). */ void -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L splice(iterator __position, list&& __x, iterator __first, iterator __last) #else @@ -1328,7 +1328,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void splice(iterator __position, list& __x, iterator __first, iterator __last) { splice(__position, std::move(__x), __first, __last); } @@ -1401,7 +1401,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * sorted order, leaving @a __x empty when complete. Elements in * this list precede elements in @a __x that are equal. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void merge(list&& __x); @@ -1426,7 +1426,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * in this list precede elements in @a __x that are equivalent * according to StrictWeakOrdering(). */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _StrictWeakOrdering> void merge(list&& __x, _StrictWeakOrdering __comp); @@ -1500,7 +1500,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER push_back(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // Called by list(n). void _M_default_initialize(size_type __n) @@ -1543,7 +1543,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { __position._M_node->_M_transfer(__first._M_node, __last._M_node); } // Inserts new element at position given and with value given. -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L void _M_insert(iterator __position, const value_type& __x) { @@ -1566,7 +1566,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { __position._M_node->_M_unhook(); _Node* __n = static_cast<_Node*>(__position._M_node); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_get_Node_allocator().destroy(__n); #else _M_get_Tp_allocator().destroy(std::__addressof(__n->_M_data)); diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 14f44579a4f..365728b5aba 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -59,7 +59,7 @@ #include <bits/functexcept.h> #include <bits/concept_check.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #include <tuple> #endif @@ -181,7 +181,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER map(const map& __x) : _M_t(__x._M_t) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Map move constructor. * @param __x A %map of identical element and allocator types. @@ -268,7 +268,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Map move assignment operator. * @param __x A %map of identical element and allocator types. @@ -384,7 +384,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 pair * in the %map. Iteration is done in ascending order according to the @@ -462,7 +462,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator __i = lower_bound(__k); // __i->first is greater than or equivalent to __k. if (__i == end() || key_comp()(__k, (*__i).first)) -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L __i = _M_t._M_emplace_hint_unique(__i, std::piecewise_construct, std::tuple<const key_type&>(__k), std::tuple<>()); @@ -472,7 +472,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return (*__i).second; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L mapped_type& operator[](key_type&& __k) { @@ -517,7 +517,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } // modifiers -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Attempts to build and insert a std::pair into the %map. * @@ -595,7 +595,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(const value_type& __x) { return _M_t._M_insert_unique(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Pair, typename = typename std::enable_if<std::is_constructible<value_type, _Pair&&>::value>::type> @@ -604,7 +604,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { return _M_t._M_insert_unique(std::forward<_Pair>(__x)); } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Attempts to insert a list of std::pairs into the %map. * @param __list A std::initializer_list<value_type> of pairs to be @@ -641,14 +641,14 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * Insertion requires logarithmic time (if the hint is not taken). */ iterator -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L 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); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Pair, typename = typename std::enable_if<std::is_constructible<value_type, _Pair&&>::value>::type> @@ -671,7 +671,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(_InputIterator __first, _InputIterator __last) { _M_t._M_insert_unique(__first, __last); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS // DR 130. Associative erase should return an iterator. /** @@ -726,7 +726,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. /** diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index a0fb27e2192..1c6a7b25388 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -58,7 +58,7 @@ #define _STL_MULTIMAP_H 1 #include <bits/concept_check.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -178,7 +178,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER multimap(const multimap& __x) : _M_t(__x._M_t) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Multimap move constructor. * @param __x A %multimap of identical element and allocator types. @@ -262,7 +262,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Multimap move assignment operator. * @param __x A %multimap of identical element and allocator types. @@ -378,7 +378,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 pair * in the %multimap. Iteration is done in ascending order according to @@ -433,7 +433,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { return _M_t.max_size(); } // modifiers -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Build and insert a std::pair into the %multimap. * @@ -502,7 +502,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(const value_type& __x) { return _M_t._M_insert_equal(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Pair, typename = typename std::enable_if<std::is_constructible<value_type, _Pair&&>::value>::type> @@ -532,14 +532,14 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * Insertion requires logarithmic time (if the hint is not taken). */ iterator -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L insert(const_iterator __position, const value_type& __x) #else insert(iterator __position, const value_type& __x) #endif { return _M_t._M_insert_equal_(__position, __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Pair, typename = typename std::enable_if<std::is_constructible<value_type, _Pair&&>::value>::type> @@ -563,7 +563,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 std::pairs into the %multimap. * @param __l A std::initializer_list<value_type> of pairs to be @@ -576,7 +576,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. /** @@ -631,7 +631,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. /** 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. /** diff --git a/libstdc++-v3/include/bits/stl_numeric.h b/libstdc++-v3/include/bits/stl_numeric.h index 3b97d63601b..4fb726cc3aa 100644 --- a/libstdc++-v3/include/bits/stl_numeric.h +++ b/libstdc++-v3/include/bits/stl_numeric.h @@ -61,7 +61,7 @@ #include <debug/debug.h> #include <bits/move.h> // For _GLIBCXX_MOVE -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index 4ece92aac12..70da3da7392 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -60,7 +60,7 @@ #include <bits/move.h> // for std::move / std::forward, and std::swap -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <type_traits> // for std::__decay_and_strip too #endif @@ -68,7 +68,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// piecewise_construct_t struct piecewise_construct_t { }; @@ -110,7 +110,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : first(__a), second(__b) { } /** There is also a templated copy ctor for the @c pair class itself. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L template<class _U1, class _U2> pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) { } @@ -242,7 +242,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { return !(__x < __y); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// See std::pair::swap(). // Note: no std::swap overloads in C++03 mode, this has performance // implications, see, eg, libstdc++/38466. @@ -265,7 +265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ // _GLIBCXX_RESOLVE_LIB_DEFECTS // 181. make_pair() unintended behavior -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // NB: DR 706. template<class _T1, class _T2> constexpr pair<typename __decay_and_strip<_T1>::__type, diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index 82ab85e8b48..add519c8883 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -131,7 +131,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Default constructor creates no elements. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L explicit queue(const _Sequence& __c = _Sequence()) : c(__c) { } @@ -214,7 +214,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION push(const value_type& __x) { c.push_back(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push(value_type&& __x) { c.push_back(std::move(__x)); } @@ -243,7 +243,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION c.pop_front(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void swap(queue& __q) noexcept(noexcept(swap(c, __q.c))) @@ -312,7 +312,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator>=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return !(__x < __y); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Seq> inline void swap(queue<_Tp, _Seq>& __x, queue<_Tp, _Seq>& __y) @@ -393,7 +393,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Default constructor creates no elements. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L explicit priority_queue(const _Compare& __x = _Compare(), const _Sequence& __s = _Sequence()) @@ -428,7 +428,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * documentation on @link functors functor base * classes@endlink. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L template<typename _InputIterator> priority_queue(_InputIterator __first, _InputIterator __last, const _Compare& __x = _Compare(), @@ -501,7 +501,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::push_heap(c.begin(), c.end(), comp); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push(value_type&& __x) { @@ -537,7 +537,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION c.pop_back(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void swap(priority_queue& __pq) noexcept(noexcept(swap(c, __pq.c)) && noexcept(swap(comp, __pq.comp))) @@ -551,7 +551,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // No equality/comparison operators are provided for priority_queue. -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Sequence, typename _Compare> inline void swap(priority_queue<_Tp, _Sequence, _Compare>& __x, diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index c3c187086d6..1850aac7f87 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -58,7 +58,7 @@ #define _STL_SET_H 1 #include <bits/concept_check.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -194,7 +194,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER set(const set& __x) : _M_t(__x._M_t) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Set move constructor * @param __x A %set of identical element and allocator types. @@ -237,7 +237,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Set move assignment operator. * @param __x A %set of identical element and allocator types. @@ -326,7 +326,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 %set. Iteration is done in ascending order according @@ -395,7 +395,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { _M_t.swap(__x._M_t); } // insert/erase -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Attempts to build and insert an element into the %set. * @param __args Arguments used to generate an element. @@ -465,7 +465,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return std::pair<iterator, bool>(__p.first, __p.second); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L std::pair<iterator, bool> insert(value_type&& __x) { @@ -498,7 +498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(const_iterator __position, const value_type& __x) { return _M_t._M_insert_unique_(__position, __x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L iterator insert(const_iterator __position, value_type&& __x) { return _M_t._M_insert_unique_(__position, std::move(__x)); } @@ -518,7 +518,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER insert(_InputIterator __first, _InputIterator __last) { _M_t._M_insert_unique(__first, __last); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Attempts to insert a list of elements into the %set. * @param __l A std::initializer_list<value_type> of elements @@ -531,7 +531,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. /** @@ -581,7 +581,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. /** diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index 4f61bfbbdf6..88ca8ca5845 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/libstdc++-v3/include/bits/stl_stack.h @@ -127,7 +127,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Default constructor creates no elements. */ -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L explicit stack(const _Sequence& __c = _Sequence()) : c(__c) { } @@ -188,7 +188,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION push(const value_type& __x) { c.push_back(__x); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push(value_type&& __x) { c.push_back(std::move(__x)); } @@ -217,7 +217,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION c.pop_back(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void swap(stack& __s) noexcept(noexcept(swap(c, __s.c))) @@ -287,7 +287,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator>=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y) { return !(__x < __y); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Seq> inline void swap(stack<_Tp, _Seq>& __x, stack<_Tp, _Seq>& __y) diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index f2adb962c29..03a5e307c58 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -132,7 +132,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Rb_tree_node<_Val>* _Link_type; _Val _M_value_field; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename... _Args> _Rb_tree_node(_Args&&... __args) : _Rb_tree_node_base(), @@ -372,7 +372,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_put_node(_Link_type __p) { _M_impl._Node_allocator::deallocate(__p, 1); } -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L _Link_type _M_create_node(const value_type& __x) { @@ -450,7 +450,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_node_count(0) { _M_initialize(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Rb_tree_impl(const _Key_compare& __comp, _Node_allocator&& __a) : _Node_allocator(std::move(__a)), _M_key_compare(__comp), _M_header(), _M_node_count(0) @@ -584,7 +584,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_get_insert_hint_equal_pos(const_iterator __pos, const key_type& __k); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> iterator _M_insert_(_Base_ptr __x, _Base_ptr __y, _Arg&& __v); @@ -661,7 +661,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Rb_tree(_Rb_tree&& __x); #endif @@ -733,7 +733,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION swap(_Rb_tree& __t); // Insert/erase. -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> pair<iterator, bool> _M_insert_unique(_Arg&& __x); @@ -795,7 +795,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_erase_aux(const_iterator __first, const_iterator __last); public: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS // DR 130. Associative erase should return an iterator. iterator @@ -828,7 +828,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION size_type erase(const key_type& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS // DR 130. Associative erase should return an iterator. iterator @@ -951,7 +951,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y) { __x.swap(__y); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: @@ -1000,12 +1000,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> #endif typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_insert_(_Base_ptr __x, _Base_ptr __p, _Arg&& __v) #else _M_insert_(_Base_ptr __x, _Base_ptr __p, const _Val& __v) @@ -1025,12 +1025,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> #endif typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_insert_lower(_Base_ptr __p, _Arg&& __v) #else _M_insert_lower(_Base_ptr __p, const _Val& __v) @@ -1050,12 +1050,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> #endif typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_insert_equal_lower(_Arg&& __v) #else _M_insert_equal_lower(const _Val& __v) @@ -1355,13 +1355,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> #endif pair<typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator, bool> _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_insert_unique(_Arg&& __v) #else _M_insert_unique(const _Val& __v) @@ -1381,12 +1381,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> #endif typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_insert_equal(_Arg&& __v) #else _M_insert_equal(const _Val& __v) @@ -1458,12 +1458,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> #endif typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_insert_unique_(const_iterator __position, _Arg&& __v) #else _M_insert_unique_(const_iterator __position, const _Val& __v) @@ -1535,12 +1535,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Arg> #endif typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_insert_equal_(const_iterator __position, _Arg&& __v) #else _M_insert_equal_(const_iterator __position, const _Val& __v) @@ -1556,7 +1556,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return _M_insert_equal_lower(_GLIBCXX_FORWARD(_Arg, __v)); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Key, typename _Val, typename _KeyOfValue, typename _Compare, typename _Alloc> typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h index 0d20335d214..b133489d8c5 100644 --- a/libstdc++-v3/include/bits/stl_uninitialized.h +++ b/libstdc++-v3/include/bits/stl_uninitialized.h @@ -444,7 +444,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // Extensions: __uninitialized_default, __uninitialized_default_n, // __uninitialized_default_a, __uninitialized_default_n_a. diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 1f14f7eda7e..b309fd3f605 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -60,7 +60,7 @@ #include <bits/stl_iterator_base_funcs.h> #include <bits/functexcept.h> #include <bits/concept_check.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <initializer_list> #endif @@ -92,7 +92,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _Tp_alloc_type(__a), _M_start(0), _M_finish(0), _M_end_of_storage(0) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Vector_impl(_Tp_alloc_type&& __a) : _Tp_alloc_type(std::move(__a)), _M_start(0), _M_finish(0), _M_end_of_storage(0) @@ -136,7 +136,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _M_impl(__a) { _M_create_storage(__n); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Vector_base(_Tp_alloc_type&& __a) : _M_impl(std::move(__a)) { } @@ -257,7 +257,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER vector(const allocator_type& __a) : _Base(__a) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Creates a %vector with default constructed elements. * @param __n The number of elements to initially create. @@ -317,7 +317,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_get_Tp_allocator()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Vector move constructor. * @param __x A %vector of identical element and allocator types. @@ -387,7 +387,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * used, then this will do at most 2N calls to the copy * constructor, and logN memory reallocations. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> vector(_InputIterator __first, _InputIterator __last, @@ -427,7 +427,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER vector& operator=(const vector& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief %Vector move assignment operator. * @param __x A %vector of identical element and allocator types. @@ -492,7 +492,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * that the resulting %vector's size is the same as the number * of elements assigned. Old data may be lost. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> void @@ -509,7 +509,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Assigns an initializer list to a %vector. * @param __l An initializer_list. @@ -602,7 +602,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER rend() const _GLIBCXX_NOEXCEPT { return const_reverse_iterator(begin()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read-only (constant) iterator that points to the * first element in the %vector. Iteration is done in ordinary @@ -651,7 +651,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER max_size() const _GLIBCXX_NOEXCEPT { return _Alloc_traits::max_size(_M_get_Tp_allocator()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Resizes the %vector to the specified number of elements. * @param __new_size Number of elements the %vector should contain. @@ -711,7 +711,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** A non-binding request to reduce capacity() to size(). */ void shrink_to_fit() @@ -871,7 +871,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * Returns a pointer such that [data(), data() + size()) is a valid * range. For a non-empty %vector, data() == &front(). */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _Tp* #else pointer @@ -879,7 +879,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER data() _GLIBCXX_NOEXCEPT { return std::__addressof(front()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L const _Tp* #else const_pointer @@ -908,14 +908,14 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ++this->_M_impl._M_finish; } else -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _M_emplace_back_aux(__x); #else _M_insert_aux(end(), __x); #endif } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void push_back(value_type&& __x) { emplace_back(std::move(__x)); } @@ -941,7 +941,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Alloc_traits::destroy(this->_M_impl, this->_M_impl._M_finish); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Inserts an object in %vector before specified iterator. * @param __position An iterator into the %vector. @@ -973,7 +973,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator insert(iterator __position, const value_type& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Inserts given rvalue into %vector before specified iterator. * @param __position An iterator into the %vector. @@ -1038,7 +1038,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * %vector and if it is frequently used the user should * consider using std::list. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> void @@ -1107,7 +1107,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ void swap(vector& __x) -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L noexcept(_Alloc_traits::_S_nothrow_swap()) #endif { @@ -1213,7 +1213,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER this->_M_impl._M_finish = this->_M_impl._M_end_of_storage; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // Called by the vector(n) constructor. void _M_default_initialize(size_type __n) @@ -1305,7 +1305,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER void _M_fill_insert(iterator __pos, size_type __n, const value_type& __x); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // Called by resize(n). void _M_default_append(size_type __n); @@ -1315,7 +1315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER #endif // Called by insert(p,x) -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L void _M_insert_aux(iterator __position, const value_type& __x); #else @@ -1350,7 +1350,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER this->_M_impl._M_finish = __pos; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L private: // Constant-time move assignment when source object's memory can be // moved, either because the source's allocator will move too diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h index 3c8014e89fa..524bae55234 100644 --- a/libstdc++-v3/include/bits/streambuf_iterator.h +++ b/libstdc++-v3/include/bits/streambuf_iterator.h @@ -52,7 +52,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class istreambuf_iterator : public iterator<input_iterator_tag, _CharT, typename _Traits::off_type, _CharT*, -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // LWG 445. _CharT> #else @@ -104,7 +104,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_CONSTEXPR istreambuf_iterator() _GLIBCXX_USE_NOEXCEPT : _M_sbuf(0), _M_c(traits_type::eof()) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L istreambuf_iterator(const istreambuf_iterator&) noexcept = default; ~istreambuf_iterator() = default; diff --git a/libstdc++-v3/include/bits/stringfwd.h b/libstdc++-v3/include/bits/stringfwd.h index 5f2d49c5579..623aa88b592 100644 --- a/libstdc++-v3/include/bits/stringfwd.h +++ b/libstdc++-v3/include/bits/stringfwd.h @@ -70,7 +70,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef basic_string<wchar_t> wstring; /// A string of @c wchar_t #endif -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) \ +#if ((__cplusplus >= 201103L) \ && defined(_GLIBCXX_USE_C99_STDINT_TR1)) template<> struct char_traits<char16_t>; diff --git a/libstdc++-v3/include/bits/uses_allocator.h b/libstdc++-v3/include/bits/uses_allocator.h index 49b5409c15a..a1e091c604c 100644 --- a/libstdc++-v3/include/bits/uses_allocator.h +++ b/libstdc++-v3/include/bits/uses_allocator.h @@ -25,7 +25,7 @@ #ifndef _USES_ALLOCATOR_H #define _USES_ALLOCATOR_H 1 -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #else diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index d9c3b659e6b..cc464cea841 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -85,7 +85,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> template<typename... _Args> void @@ -117,7 +117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } else { -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage) { _Tp __x_copy = __x; @@ -163,7 +163,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { if (&__x != this) { -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L if (_Alloc_traits::_S_propagate_on_copy_assign()) { if (!_Alloc_traits::_S_always_equal() @@ -285,7 +285,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> template<typename... _Args> typename vector<_Tp, _Alloc>::iterator @@ -323,13 +323,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_MOVE(*(this->_M_impl._M_finish - 1))); ++this->_M_impl._M_finish; -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L _Tp __x_copy = __x; #endif _GLIBCXX_MOVE_BACKWARD3(__position.base(), this->_M_impl._M_finish - 2, this->_M_impl._M_finish - 1); -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L *__position = __x_copy; #else *__position = _Tp(std::forward<_Args>(__args)...); @@ -350,7 +350,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // taking the element by const lvalue ref (see 23.1/13). _Alloc_traits::construct(this->_M_impl, __new_start + __elems_before, -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L std::forward<_Args>(__args)...); #else __x); @@ -390,7 +390,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> template<typename... _Args> void @@ -524,7 +524,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Tp, typename _Alloc> void vector<_Tp, _Alloc>:: @@ -788,7 +788,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Alloc> bool vector<bool, _Alloc>:: @@ -809,7 +809,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER } // namespace std -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L namespace std _GLIBCXX_VISIBILITY(default) { @@ -851,6 +851,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace std -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif /* _VECTOR_TCC */ |