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/algorithmfwd.h | |
| 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/algorithmfwd.h')
| -rw-r--r-- | libstdc++-v3/include/bits/algorithmfwd.h | 24 |
1 files changed, 12 insertions, 12 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&); |