diff options
Diffstat (limited to 'libstdc++-v3/include/tr1')
| -rw-r--r-- | libstdc++-v3/include/tr1/complex | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/functional | 14 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/shared_ptr.h | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/libstdc++-v3/include/tr1/complex b/libstdc++-v3/include/tr1/complex index 689ea167ba2..948fe72fd62 100644 --- a/libstdc++-v3/include/tr1/complex +++ b/libstdc++-v3/include/tr1/complex @@ -45,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @{ */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L using std::acos; using std::asin; using std::atan; @@ -62,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // The std::fabs return type in C++0x mode is different (just _Tp). template<typename _Tp> std::complex<_Tp> fabs(const std::complex<_Tp>&); -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L template<typename _Tp> inline std::complex<_Tp> __complex_acos(const std::complex<_Tp>& __z) @@ -179,7 +179,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return __complex_atan(__z); } #endif -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 template<typename _Tp> std::complex<_Tp> @@ -309,7 +309,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return std::abs(__z); } /// Additional overloads [8.1.9]. -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L template<typename _Tp> inline typename __gnu_cxx::__promote<_Tp>::__type diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional index d9b7a842bcd..88a81495d87 100644 --- a/libstdc++-v3/include/tr1/functional +++ b/libstdc++-v3/include/tr1/functional @@ -42,13 +42,13 @@ #include <tr1/functional_hash.h> #include <ext/type_traits.h> #include <bits/move.h> // for std::__addressof -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L # include <type_traits> // for integral_constant, true_type, false_type #endif namespace std _GLIBCXX_VISIBILITY(default) { -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _GLIBCXX_BEGIN_NAMESPACE_VERSION template<int> struct _Placeholder; template<typename> class _Bind; @@ -914,7 +914,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<int _Num> const int is_placeholder<_Placeholder<_Num> >::value; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<int _Num> struct is_placeholder<std::_Placeholder<_Num>> : std::integral_constant<int, _Num> @@ -1430,7 +1430,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION is_bind_expression<const volatile _Bind_result<_Result, _Signature> >::value; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template<typename _Signature> struct is_bind_expression<std::_Bind<_Signature>> : true_type { }; @@ -1889,7 +1889,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : public _Maybe_unary_or_binary_function<_Res, _ArgTypes...>, private _Function_base { -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L /// This class is used to implement the safe_bool idiom. struct _Hidden_type { @@ -2042,7 +2042,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * This function will not throw an %exception. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L explicit operator bool() const { return !_M_empty(); } #else @@ -2252,7 +2252,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename> struct is_placeholder; diff --git a/libstdc++-v3/include/tr1/shared_ptr.h b/libstdc++-v3/include/tr1/shared_ptr.h index 8f9870deb59..9220e304c61 100644 --- a/libstdc++-v3/include/tr1/shared_ptr.h +++ b/libstdc++-v3/include/tr1/shared_ptr.h @@ -584,7 +584,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_ptr = __r._M_ptr; } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED +#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED // Postcondition: use_count() == 1 and __r.get() == 0 template<typename _Tp1> explicit @@ -630,7 +630,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED +#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED template<typename _Tp1> __shared_ptr& operator=(std::auto_ptr<_Tp1>& __r) @@ -1007,7 +1007,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION shared_ptr(const weak_ptr<_Tp1>& __r) : __shared_ptr<_Tp>(__r) { } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED +#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED template<typename _Tp1> explicit shared_ptr(std::auto_ptr<_Tp1>& __r) @@ -1034,7 +1034,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED +#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED template<typename _Tp1> shared_ptr& operator=(std::auto_ptr<_Tp1>& __r) |