From 734f50238f863ae90d2e8caa2323aaa02380ff48 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 10 Nov 2012 12:27:22 -0500 Subject: * many: Replace uses of __GXX_EXPERIMENTAL_CXX0X__ with __cplusplus. From-SVN: r193392 --- libstdc++-v3/include/std/valarray | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'libstdc++-v3/include/std/valarray') diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index a159aab5..16d3abe 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -39,7 +39,7 @@ #include #include #include -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include #endif @@ -142,7 +142,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Copy constructor. valarray(const valarray&); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// Move constructor. valarray(valarray&&) noexcept; #endif @@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Construct an array with the same size and values in @a ia. valarray(const indirect_array<_Tp>&); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// Construct an array with an initializer_list of values. valarray(initializer_list<_Tp>); #endif @@ -179,7 +179,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ valarray<_Tp>& operator=(const valarray<_Tp>& __v); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Move assign elements to an array. * @@ -239,7 +239,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ valarray<_Tp>& operator=(const indirect_array<_Tp>& __ia); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Assign elements to an initializer_list. * @@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION valarray<_Tp>& operator>>=(const _Expr<_Dom, _Tp>&); // _lib.valarray.members_ member functions: -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// Swap. void swap(valarray<_Tp>& __v) noexcept; #endif @@ -634,7 +634,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { std::__valarray_copy_construct(__v._M_data, __v._M_data + _M_size, _M_data); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template inline valarray<_Tp>::valarray(valarray<_Tp>&& __v) noexcept @@ -683,7 +683,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION (__ia._M_array, __ia._M_index, _Array<_Tp>(_M_data), _M_size); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template inline valarray<_Tp>::valarray(initializer_list<_Tp> __l) @@ -728,7 +728,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template inline valarray<_Tp>& valarray<_Tp>::operator=(valarray<_Tp>&& __v) noexcept @@ -895,7 +895,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Array(__i)); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template inline void valarray<_Tp>::swap(valarray<_Tp>& __v) noexcept @@ -1174,7 +1174,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) #undef _DEFINE_BINARY_OPERATOR -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Return an iterator pointing to the first element of * the valarray. @@ -1214,7 +1214,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) inline const _Tp* end(const valarray<_Tp>& __va) { return std::__addressof(__va[0]) + __va.size(); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 // @} group numeric_arrays -- cgit v1.1