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/debug/vector | |
| parent | f955ca518bf9bfa53aabe55c11a67c6c5a2a3581 (diff) | |
| download | ppe42-gcc-0c8766b14373cdc13b9c966130ec877e0fa29865.tar.gz ppe42-gcc-0c8766b14373cdc13b9c966130ec877e0fa29865.zip | |
* 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/debug/vector')
| -rw-r--r-- | libstdc++-v3/include/debug/vector | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index fe65bab0c7a..9166a073691 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -53,7 +53,7 @@ namespace __debug typedef typename _Base::const_iterator _Base_const_iterator; typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L typedef __gnu_cxx::__alloc_traits<_Allocator> _Alloc_traits; #endif @@ -81,7 +81,7 @@ namespace __debug vector(const _Allocator& __a = _Allocator()) : _Base(__a), _M_guaranteed_capacity(0) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L explicit vector(size_type __n, const _Allocator& __a = _Allocator()) : _Base(__n, __a), _M_guaranteed_capacity(__n) { } @@ -96,7 +96,7 @@ namespace __debug : _Base(__n, __value, __a), _M_guaranteed_capacity(__n) { } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<class _InputIterator, typename = std::_RequireInputIter<_InputIterator>> #else @@ -117,7 +117,7 @@ namespace __debug vector(const _Base& __x) : _Base(__x), _M_guaranteed_capacity(__x.size()) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L vector(vector&& __x) noexcept : _Base(std::move(__x)), _M_guaranteed_capacity(this->size()) @@ -154,7 +154,7 @@ namespace __debug return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L vector& operator=(vector&& __x) noexcept(_Alloc_traits::_S_nothrow_move()) { @@ -177,7 +177,7 @@ namespace __debug } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _InputIterator, typename = std::_RequireInputIter<_InputIterator>> #else @@ -201,7 +201,7 @@ namespace __debug _M_update_guaranteed_capacity(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void assign(initializer_list<value_type> __l) { @@ -246,7 +246,7 @@ namespace __debug rend() const _GLIBCXX_NOEXCEPT { return const_reverse_iterator(begin()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L const_iterator cbegin() const noexcept { return const_iterator(_Base::begin(), this); } @@ -268,7 +268,7 @@ namespace __debug using _Base::size; using _Base::max_size; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void resize(size_type __sz) { @@ -306,7 +306,7 @@ namespace __debug } #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L void shrink_to_fit() { @@ -401,7 +401,7 @@ namespace __debug _M_update_guaranteed_capacity(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Up = _Tp> typename __gnu_cxx::__enable_if<!std::__are_same<_Up, bool>::__value, void>::__type @@ -428,7 +428,7 @@ namespace __debug _Base::pop_back(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename... _Args> iterator emplace(iterator __position, _Args&&... __args) @@ -462,7 +462,7 @@ namespace __debug return iterator(__res, this); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Up = _Tp> typename __gnu_cxx::__enable_if<!std::__are_same<_Up, bool>::__value, iterator>::__type @@ -488,7 +488,7 @@ namespace __debug _M_update_guaranteed_capacity(); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<class _InputIterator, typename = std::_RequireInputIter<_InputIterator>> #else @@ -546,11 +546,11 @@ namespace __debug void swap(vector& __x) -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L noexcept(_Alloc_traits::_S_nothrow_swap()) #endif { -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L if (!_Alloc_traits::_S_propagate_on_swap()) __glibcxx_check_equal_allocs(__x); #endif @@ -638,7 +638,7 @@ namespace __debug } // namespace __debug -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // DR 1182. /// std::hash specialization for vector<bool>. template<typename _Alloc> |

