From patchwork Thu Oct 11 22:24:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 191013 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 09E582C0093 for ; Fri, 12 Oct 2012 09:24:41 +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=1350599082; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Message-ID:Date:From:User-Agent:MIME-Version: To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=RBxMYchHmWFk4nr0gBtsjBXFny8=; b=JHBQJ8b4Mq6ZL/S RkB7gsFxFhOQ8DAj1pZZ4cAhhv817WTcAQSpeaPTD6YThknAHtyTNz9hZnJL7+vv RVS+vcgqO+iz0PL6qj/UoDN3yuibuKO7a2WpY2igWK8hw2oE0d1c8Cff/MyITK0i qbqML2OYDVWdjHAYd2TG+c1HN0lQ= 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:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=PK1kwXKZNIskv0NfysXKeOYzp6/Pf/810sp78ZOfL+R6jf0MhtsE93ZBxWvMVu GKEJ8nmrFMLRnvmhqbNBGJu9tLlecL+8WuJDMJkv8mGPNL15wNbTgk4dvxMwm9rm 2QGuSyOC4ICsfqNSaHt+ymg6z3/Hz/vHYI7mjuXJh4GOk=; Received: (qmail 21840 invoked by alias); 11 Oct 2012 22:24:33 -0000 Received: (qmail 21814 invoked by uid 22791); 11 Oct 2012 22:24:30 -0000 X-SWARE-Spam-Status: No, hits=-8.0 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, T_FILL_THIS_FORM_SHORT X-Spam-Check-By: sourceware.org Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 11 Oct 2012 22:24:24 +0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q9BMOLTE006033 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Oct 2012 22:24:23 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q9BMOKU6001235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 11 Oct 2012 22:24:21 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q9BMOKU3002691; Thu, 11 Oct 2012 17:24:20 -0500 Received: from [192.168.1.4] (/79.25.197.249) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 11 Oct 2012 15:24:20 -0700 Message-ID: <50774712.4050305@oracle.com> Date: Fri, 12 Oct 2012 00:24:18 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120825 Thunderbird/15.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Remove hack for 53067 in mainline X-IsSubscribed: yes 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 Hi, not necessary anymore thanks to the resolution of c++/51213. Tested x86_64-linux multilib, committed. Thanks, Paolo. /////////////////////// 2012-10-12 Paolo Carlini * include/bits/hashtable_policy.h: Revert libstdc++/53067 quick hacks thanks to the resolution of c++/51213. Index: include/bits/hashtable_policy.h =================================================================== --- include/bits/hashtable_policy.h (revision 192378) +++ include/bits/hashtable_policy.h (working copy) @@ -921,8 +921,7 @@ /// Specialization using EBO. template struct _Hashtable_ebo_helper<_Nm, _Tp, true> - // See PR53067. - : public _Tp + : private _Tp { _Hashtable_ebo_helper() = default; @@ -989,9 +988,8 @@ template struct _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash, false> - // See PR53067. - : public _Hashtable_ebo_helper<0, _ExtractKey>, - public _Hashtable_ebo_helper<1, _Hash> + : private _Hashtable_ebo_helper<0, _ExtractKey>, + private _Hashtable_ebo_helper<1, _Hash> { private: typedef _Hashtable_ebo_helper<0, _ExtractKey> _EboExtractKey; @@ -1066,10 +1064,9 @@ typename _H1, typename _H2> struct _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Default_ranged_hash, false> - // See PR53067. - : public _Hashtable_ebo_helper<0, _ExtractKey>, - public _Hashtable_ebo_helper<1, _H1>, - public _Hashtable_ebo_helper<2, _H2> + : private _Hashtable_ebo_helper<0, _ExtractKey>, + private _Hashtable_ebo_helper<1, _H1>, + private _Hashtable_ebo_helper<2, _H2> { private: typedef _Hashtable_ebo_helper<0, _ExtractKey> _EboExtractKey; @@ -1150,10 +1147,9 @@ typename _H1, typename _H2> struct _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Default_ranged_hash, true> - // See PR53067. - : public _Hashtable_ebo_helper<0, _ExtractKey>, - public _Hashtable_ebo_helper<1, _H1>, - public _Hashtable_ebo_helper<2, _H2> + : private _Hashtable_ebo_helper<0, _ExtractKey>, + private _Hashtable_ebo_helper<1, _H1>, + private _Hashtable_ebo_helper<2, _H2> { private: typedef _Hashtable_ebo_helper<0, _ExtractKey> _EboExtractKey; @@ -1272,8 +1268,7 @@ typename _H1, typename _H2, typename _Hash> struct _Local_iterator_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash, true> - // See PR53067. - : public _H2 + : private _H2 { _Local_iterator_base() = default; _Local_iterator_base(_Hash_node<_Value, true>* __p, @@ -1305,9 +1300,8 @@ typename _H1, typename _H2, typename _Hash> struct _Local_iterator_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash, false> - // See PR53067. - : public _Hash_code_base<_Key, _Value, _ExtractKey, - _H1, _H2, _Hash, false> + : private _Hash_code_base<_Key, _Value, _ExtractKey, + _H1, _H2, _Hash, false> { _Local_iterator_base() = default; _Local_iterator_base(_Hash_node<_Value, false>* __p, @@ -1470,10 +1464,9 @@ typename _ExtractKey, typename _Equal, typename _H1, typename _H2, typename _Hash, typename _Traits> struct _Hashtable_base - // See PR53067. - : public _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash, - _Traits::__hash_cached::value>, - public _Hashtable_ebo_helper<0, _Equal> + : public _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash, + _Traits::__hash_cached::value>, + private _Hashtable_ebo_helper<0, _Equal> { public: typedef _Key key_type;