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/c_global | |
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/c_global')
-rw-r--r-- | libstdc++-v3/include/c_global/ccomplex | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cctype | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cfenv | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cfloat | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cinttypes | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cmath | 8 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cstdalign | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cstdbool | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cstdint | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/ctgmath | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cwchar | 4 |
11 files changed, 19 insertions, 19 deletions
diff --git a/libstdc++-v3/include/c_global/ccomplex b/libstdc++-v3/include/c_global/ccomplex index 0109ec10e9a..f9aeaed47ef 100644 --- a/libstdc++-v3/include/c_global/ccomplex +++ b/libstdc++-v3/include/c_global/ccomplex @@ -31,7 +31,7 @@ #ifndef _GLIBCXX_CCOMPLEX #define _GLIBCXX_CCOMPLEX 1 -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #endif diff --git a/libstdc++-v3/include/c_global/cctype b/libstdc++-v3/include/c_global/cctype index 0fed691ecef..e0b73626963 100644 --- a/libstdc++-v3/include/c_global/cctype +++ b/libstdc++-v3/include/c_global/cctype @@ -78,7 +78,7 @@ namespace std using ::toupper; } // namespace std -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #ifdef _GLIBCXX_USE_C99_CTYPE_TR1 @@ -91,6 +91,6 @@ namespace std #endif // _GLIBCXX_USE_C99_CTYPE_TR1 -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv index 35010a0ba20..37b8eca8b09 100644 --- a/libstdc++-v3/include/c_global/cfenv +++ b/libstdc++-v3/include/c_global/cfenv @@ -31,7 +31,7 @@ #pragma GCC system_header -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #else @@ -79,6 +79,6 @@ namespace std #endif // _GLIBCXX_USE_C99_FENV_TR1 -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif // _GLIBCXX_CFENV diff --git a/libstdc++-v3/include/c_global/cfloat b/libstdc++-v3/include/c_global/cfloat index 2bc7883bfed..065ae19d6e6 100644 --- a/libstdc++-v3/include/c_global/cfloat +++ b/libstdc++-v3/include/c_global/cfloat @@ -43,7 +43,7 @@ #ifndef _GLIBCXX_CFLOAT #define _GLIBCXX_CFLOAT 1 -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L # ifndef DECIMAL_DIG # define DECIMAL_DIG __DECIMAL_DIG__ # endif diff --git a/libstdc++-v3/include/c_global/cinttypes b/libstdc++-v3/include/c_global/cinttypes index 030962bdf32..ce2fe720d7c 100644 --- a/libstdc++-v3/include/c_global/cinttypes +++ b/libstdc++-v3/include/c_global/cinttypes @@ -31,7 +31,7 @@ #pragma GCC system_header -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #else @@ -76,6 +76,6 @@ namespace std #endif // _GLIBCXX_USE_C99_INTTYPES_TR1 -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif // _GLIBCXX_CINTTYPES diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath index d488c7740ec..90f76650520 100644 --- a/libstdc++-v3/include/c_global/cmath +++ b/libstdc++-v3/include/c_global/cmath @@ -413,7 +413,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION pow(long double __x, long double __y) { return __builtin_powl(__x, __y); } -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS // DR 550. What should the return type of pow(float,int) be? inline double @@ -558,7 +558,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L constexpr int fpclassify(float __x) { return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, @@ -921,7 +921,7 @@ _GLIBCXX_END_NAMESPACE_VERSION #endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */ #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #ifdef _GLIBCXX_USE_C99_MATH_TR1 @@ -1682,6 +1682,6 @@ _GLIBCXX_END_NAMESPACE_VERSION #endif // _GLIBCXX_USE_C99_MATH_TR1 -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif diff --git a/libstdc++-v3/include/c_global/cstdalign b/libstdc++-v3/include/c_global/cstdalign index 31f0c1b384e..353382757f2 100644 --- a/libstdc++-v3/include/c_global/cstdalign +++ b/libstdc++-v3/include/c_global/cstdalign @@ -31,7 +31,7 @@ #ifndef _GLIBCXX_CSTDALIGN #define _GLIBCXX_CSTDALIGN 1 -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #else # include <bits/c++config.h> diff --git a/libstdc++-v3/include/c_global/cstdbool b/libstdc++-v3/include/c_global/cstdbool index dd428f2d288..fbc03f81276 100644 --- a/libstdc++-v3/include/c_global/cstdbool +++ b/libstdc++-v3/include/c_global/cstdbool @@ -31,7 +31,7 @@ #ifndef _GLIBCXX_CSTDBOOL #define _GLIBCXX_CSTDBOOL 1 -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #else # include <bits/c++config.h> diff --git a/libstdc++-v3/include/c_global/cstdint b/libstdc++-v3/include/c_global/cstdint index 5ebee3bd793..d61d383a6bb 100644 --- a/libstdc++-v3/include/c_global/cstdint +++ b/libstdc++-v3/include/c_global/cstdint @@ -31,7 +31,7 @@ #pragma GCC system_header -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #else @@ -84,6 +84,6 @@ namespace std #endif // _GLIBCXX_USE_C99_STDINT_TR1 -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif // _GLIBCXX_CSTDINT diff --git a/libstdc++-v3/include/c_global/ctgmath b/libstdc++-v3/include/c_global/ctgmath index 6b51005cc11..13eee2a4200 100644 --- a/libstdc++-v3/include/c_global/ctgmath +++ b/libstdc++-v3/include/c_global/ctgmath @@ -31,7 +31,7 @@ #ifndef _GLIBCXX_CTGMATH #define _GLIBCXX_CTGMATH 1 -#ifndef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus < 201103L # include <bits/c++0x_warning.h> #else # include <cmath> diff --git a/libstdc++-v3/include/c_global/cwchar b/libstdc++-v3/include/c_global/cwchar index a2b1168f9a0..8ed424e3cfc 100644 --- a/libstdc++-v3/include/c_global/cwchar +++ b/libstdc++-v3/include/c_global/cwchar @@ -272,7 +272,7 @@ namespace std #endif //_GLIBCXX_USE_WCHAR_T -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #ifdef _GLIBCXX_USE_WCHAR_T @@ -300,6 +300,6 @@ namespace std #endif // _GLIBCXX_USE_WCHAR_T -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 #endif |