From patchwork Tue Nov 20 00:23:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 200219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id DA5F52C008F for ; Tue, 20 Nov 2012 11:24:10 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1353975851; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:In-Reply-To:References:Date: Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=io178i8ZFrWDKb+FPCFaoh1h3fA=; b=b0fSfvSm43/EALRy2f4wcMc7jjNygQLa8/cokAhHOXAScdHxif9D4ZJVZk7IdJ OYhzytc0AaFznmIIHsMCx3up1dbIzUYVI7EEn4ZR0NUSP1kK1WoxjbbLM1faUUo2 sJ+Fgkp+y0AaQhCfneT3l7G/SNKhYZX6y5yW9j2jWNhlM= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:In-Reply-To:References:Date:Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=GhsxsHgR/2Xelr8/PBeAtDfu9+6y+PsvoqgKaUAjn57Ejax+2Nd0cABCbCrpWZ /eAa5EEP4PYHhdZgV8ciqPVkrbJ9sAjH+MVPrz1+MQKudmWKAyxKv0GE6md9Vz2W ooRKQX3ffF+BKyQW+tGgVSh5cbaWwwEhOZHSAxFktCxoE=; Received: (qmail 19258 invoked by alias); 20 Nov 2012 00:23:59 -0000 Received: (qmail 19171 invoked by uid 22791); 20 Nov 2012 00:23:55 -0000 X-SWARE-Spam-Status: No, hits=-5.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-ia0-f175.google.com (HELO mail-ia0-f175.google.com) (209.85.210.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 20 Nov 2012 00:23:50 +0000 Received: by mail-ia0-f175.google.com with SMTP id z3so3963429iad.20 for ; Mon, 19 Nov 2012 16:23:50 -0800 (PST) MIME-Version: 1.0 Received: by 10.50.151.238 with SMTP id ut14mr8236033igb.58.1353371029999; Mon, 19 Nov 2012 16:23:49 -0800 (PST) Received: by 10.42.158.202 with HTTP; Mon, 19 Nov 2012 16:23:49 -0800 (PST) In-Reply-To: References: <14898540.213093.1353368590378.JavaMail.root@vznit170116> Date: Tue, 20 Nov 2012 00:23:49 +0000 Message-ID: Subject: Re: [patch] Apply recent DRs resolutions to libstdc++ From: Jonathan Wakely To: 3dw4rd@verizon.net Cc: gcc-patches@gcc.gnu.org, "libstdc++" Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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 Date: Tue Nov 20 00:20:16 2012 +0000 * include/ext/array_allocator.h: Replace uses of __GXX_EXPERIMENTAL_CXX0X__ with __cplusplus. 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 #include #include -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include #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;