From patchwork Sat Oct 20 02:08:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 192886 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 7E8F52C0098 for ; Sat, 20 Oct 2012 13:09:06 +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=1351303747; 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=myOauwHkqEwOBlcOspLtfX2Yy30=; b=bZ4fHOJ3mBKoFkGVa4EhENJcOF+uso4xwub7zrz8E+LnaokNBWX9iJFpsc0epd wuSeHyk7eD24k2ueBuwFEbbcPysZmJxqg9Q1mdGYZ2sP0YUC1OdiKRzTqwg2Vgjc je6xcTYme2enRIqp5Pg4B9PPwDpeVDbItT+aKvlbnsUEk= 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=SMXEBocHupfb3E6wsAtX5v/WD3QQydMKGEe0yI6auChjjoFb01PAgdRFXmMF/3 SjzP9HWEcPeIG6nxx34gd78Ytrt3TmpPQVlP/tXONTqvuWVMLE+uxWDicicIQNy7 vtRUHlq65u1dSQ/NOYcDLUlsZrD1PpF04+zcA4avE1SW8=; Received: (qmail 10601 invoked by alias); 20 Oct 2012 02:08:52 -0000 Received: (qmail 10442 invoked by uid 22791); 20 Oct 2012 02:08:51 -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-ie0-f175.google.com (HELO mail-ie0-f175.google.com) (209.85.223.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 20 Oct 2012 02:08:45 +0000 Received: by mail-ie0-f175.google.com with SMTP id c13so1651680ieb.20 for ; Fri, 19 Oct 2012 19:08:43 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.15.132 with SMTP id x4mr3254118igc.58.1350698923615; Fri, 19 Oct 2012 19:08:43 -0700 (PDT) Received: by 10.42.158.202 with HTTP; Fri, 19 Oct 2012 19:08:43 -0700 (PDT) In-Reply-To: References: <201210192028.q9JKSIBF007079@ignucius.se.axis.com> Date: Sat, 20 Oct 2012 03:08:43 +0100 Message-ID: Subject: Re: breakage with "[v3] (almost) finish " From: Jonathan Wakely To: Hans-Peter Nilsson Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org 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 20 October 2012 02:35, Jonathan Wakely wrote: > On 19 October 2012 21:28, Hans-Peter Nilsson wrote: >> Looks like _U is one of those identifiers that should be >> avoided: Grep yields: >> src/newlib/libc/include/ctype.h:#define _U 01 > > Argh! my bad, sorry - fix on the way ... Sorry about that, _U is in the badnames list and I really should know better. Fixed by this patch: * include/std/scoped_allocator: Avoid badname. Tested x86_64-linux, committed to trunk. commit dc33ce8c77b3c7d6a39cdf28359cbc2afae9d1da Author: Jonathan Wakely Date: Sat Oct 20 02:40:43 2012 +0100 * include/std/scoped_allocator: Avoid badname. diff --git a/libstdc++-v3/include/std/scoped_allocator b/libstdc++-v3/include/std/scoped_allocator index 81365b6..07a2e5e 100644 --- a/libstdc++-v3/include/std/scoped_allocator +++ b/libstdc++-v3/include/std/scoped_allocator @@ -365,31 +365,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION construct(pair<_T1, _T2>* __p) { construct(__p, piecewise_construct, tuple<>(), tuple<>()); } - template + template void - construct(pair<_T1, _T2>* __p, _U&& __u, _V&& __v) + construct(pair<_T1, _T2>* __p, _Up&& __u, _Vp&& __v) { construct(__p, piecewise_construct, - std::forward_as_tuple(std::forward<_U>(__u)), - std::forward_as_tuple(std::forward<_V>(__v))); + std::forward_as_tuple(std::forward<_Up>(__u)), + std::forward_as_tuple(std::forward<_Vp>(__v))); } - template + template void - construct(pair<_T1, _T2>* __p, const pair<_U, _V>& __x) + construct(pair<_T1, _T2>* __p, const pair<_Up, _Vp>& __x) { construct(__p, piecewise_construct, std::forward_as_tuple(__x.first), std::forward_as_tuple(__x.second)); } - template + template void - construct(pair<_T1, _T2>* __p, pair<_U, _V>&& __x) + construct(pair<_T1, _T2>* __p, pair<_Up, _Vp>&& __x) { construct(__p, piecewise_construct, - std::forward_as_tuple(std::forward<_U>(__x.first)), - std::forward_as_tuple(std::forward<_V>(__x.second))); + std::forward_as_tuple(std::forward<_Up>(__x.first)), + std::forward_as_tuple(std::forward<_Vp>(__x.second))); } template