diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-11-20 00:24:18 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-11-20 00:24:18 +0000 |
| commit | 6b1328eb3c6d94a907bd1fc7c1b6554174e01408 (patch) | |
| tree | 935e282812cec72df902aadec9df0808e38e7e7d | |
| parent | b51eb4ffa16191d50d62ee78b0cede071cb4207e (diff) | |
| download | gcc-6b1328eb3c6d94a907bd1fc7c1b6554174e01408.zip gcc-6b1328eb3c6d94a907bd1fc7c1b6554174e01408.tar.gz gcc-6b1328eb3c6d94a907bd1fc7c1b6554174e01408.tar.bz2 | |
array_allocator.h: Replace uses of __GXX_EXPERIMENTAL_CXX0X__ with __cplusplus.
* include/ext/array_allocator.h: Replace uses of
__GXX_EXPERIMENTAL_CXX0X__ with __cplusplus.
From-SVN: r193644
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/array_allocator.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f96cf7a..3ced7cf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2012-11-20 Jonathan Wakely <jwakely.gcc@gmail.com> + + * include/ext/array_allocator.h: Replace uses of + __GXX_EXPERIMENTAL_CXX0X__ with __cplusplus. + 2012-11-19 Jonathan Wakely <jwakely.gcc@gmail.com> * testsuite/20_util/allocator/requirements/typedefs.cc: Check rebind diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index 736ae02..f3a8572 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -34,7 +34,7 @@ #include <bits/functexcept.h> #include <tr1/array> #include <bits/move.h> -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include <type_traits> #endif @@ -115,7 +115,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Tp value_type; typedef _Array array_type; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L // _GLIBCXX_RESOLVE_LIB_DEFECTS // 2103. std::allocator propagate_on_container_move_assignment typedef std::true_type propagate_on_container_move_assignment; |