From patchwork Thu May 31 23:06:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Kosnik X-Patchwork-Id: 162244 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 53D73B6FC2 for ; Fri, 1 Jun 2012 09:06:31 +1000 (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=1339110392; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Subject:Message-ID:Mime-Version:Content-Type: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=coLSReS7fsMQFatqSRFK ragrAxw=; b=rgnMCROZ7OUNXCFD9wJwOmwnr3m0/vnUAmsIC7f8QaDL421YPPS/ /ZRbr4HUQHkptUfueAShWOq1W7jGH1DBsE04olEy7y04n4PjQil8XBs/ak5MqfeK A9F5jdspmsSmq0UXMO03kqpgmO3izzUH4EdklPgOJEY/wLwulqkHi8M= 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:Received:Date:From:To:Subject:Message-ID:Mime-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=WX4OdizPLS5SVGU+VR9HeyIY3EtBLQ8AM0yhAcJVlQjCj36gPm7E8FH91JfthX YG0ZuDFhMF8SGtlTMS/izbuD1TLcGB3yKoUe+lahQqXzAT49B35r+reWqQuYdDxY KXmE/NTDWY9kxFNKWran4sA1MZVJi77QhN2MnxlgLU4BM=; Received: (qmail 9225 invoked by alias); 31 May 2012 23:06:24 -0000 Received: (qmail 9211 invoked by uid 22791); 31 May 2012 23:06:23 -0000 X-SWARE-Spam-Status: No, hits=-5.8 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 31 May 2012 23:06:08 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4VN67k9016448 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 31 May 2012 19:06:07 -0400 Received: from adair (ovpn-113-159.phx2.redhat.com [10.3.113.159]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4VN664c012266; Thu, 31 May 2012 19:06:06 -0400 Date: Thu, 31 May 2012 16:06:06 -0700 From: Benjamin De Kosnik To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [v3] libstdc++/53543 Message-ID: <20120531160606.3d174006@adair> Mime-Version: 1.0 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 Renames to avoid builtins on clang. (This patch of code is actually the punchline to the joke, "how many template aliases are really required if you are going for no line breaks and using 80 columns while using policy based designs.") tested x86/linux -benjamin 2012-05-31 Benjamin Kosnik PR libstdc++/53543 * include/bits/hashtable_policy.h (_Insert::__is_convertible): Rename to __is_conv to avoid clash with clang built-in. diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index 708ef98..27badbc 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -831,10 +831,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __base_type::insert; template - using __is_convertible = std::is_convertible<_Pair, value_type>; + using __is_conv = std::is_convertible<_Pair, value_type>; template - using _IFconv = std::enable_if<__is_convertible<_Pair>::value>; + using _IFconv = std::enable_if<__is_conv<_Pair>::value>; template using _IFconvp = typename _IFconv<_Pair>::type;