Patchwork Apply recent DRs resolutions to libstdc++

login
register
mail settings
Submitter Jonathan Wakely
Date Nov. 20, 2012, 12:23 a.m.
Message ID <CAH6eHdSm7662qcdz3P6w0oD5WZH6e4OaJi7jf24aynF6zmEZrw@mail.gmail.com>
Download mbox | patch
Permalink /patch/200219/
State New
Headers show

Comments

Jonathan Wakely - Nov. 20, 2012, 12:23 a.m.
On 19 November 2012 23:45, Jonathan Wakely wrote:
> On 19 November 2012 23:43,  wrote:
>> I looks like there were a couple
>> #ifdef __GXX_EXPERIMENTAL_CXX0X__
>> in the patch.  I think you want to change these to
>> #if __cplusplus >= 201103L
>>
>> ?
>
> Oops, I thought I'd updated them all. I'll fix it, thanks.

Fixed by this patch.

        * include/ext/array_allocator.h: Replace uses of
        __GXX_EXPERIMENTAL_CXX0X__ with __cplusplus.
commit 72448fc9e1e09a067c6ea7dbde40614de0b09059
Author: Jonathan Wakely <jwakely.gcc@gmail.com>
Date:   Tue Nov 20 00:20:16 2012 +0000

    	* include/ext/array_allocator.h: Replace uses of
    	__GXX_EXPERIMENTAL_CXX0X__ with __cplusplus.

Patch

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;