From patchwork Tue Jul 8 02:21:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Saunders X-Patchwork-Id: 367785 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D37CC140103 for ; Tue, 8 Jul 2014 12:21:56 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=mt/dG/rpxsZt Bjanog4C7gs4/G7DmB3zT76X/6OT3FrHqYUjaL18d6X8bOpGi7yImUX0H3/cK1ZR UMLal4HmhiogaErX8+bqKHL4XWQoNDH34Ae5rbTUB3SL9JDsT8EtHlMdt4pJ5bCs gn+pudr0yfw1i96SF3wOU1P1PDrbr20= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=jaOKQEVF1UajMHX0KK BDTqgpUkU=; b=M73gZeGjaZY9JXznvnPAK5IIRCa1kev07w4TZwGPoO0nWhAh7R ptDOG2DY2CXf6SksSDLLRsoRK3pQY0Kfl03Pm/TVwSi5mzL8tWD8GmH2m/3z9rWi DMxWd84DIKp1OhbxYFJ9wGAHhrWHv+5uWR0oz+ST6G2B9R9qtA0P0i0Yk= Received: (qmail 22292 invoked by alias); 8 Jul 2014 02:21:47 -0000 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 Received: (qmail 22227 invoked by uid 89); 8 Jul 2014 02:21:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.mozilla.org Received: from mx2.corp.phx1.mozilla.com (HELO smtp.mozilla.org) (63.245.216.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 08 Jul 2014 02:21:36 +0000 Received: from iceball.corp.tor1.mozilla.com (unknown [64.213.68.131]) (Authenticated sender: tsaunders@mozilla.com) by mx2.mail.corp.phx1.mozilla.com (Postfix) with ESMTPSA id 550F2F243C; Mon, 7 Jul 2014 19:21:34 -0700 (PDT) From: tsaunders@mozilla.com To: gcc-patches@gcc.gnu.org Cc: Trevor Saunders Subject: [PATCH] PR bootstrap/61679 playcate old gcc Date: Mon, 7 Jul 2014 22:21:10 -0400 Message-Id: <1404786070-10805-1-git-send-email-tsaunders@mozilla.com> X-IsSubscribed: yes From: Trevor Saunders Hi, I'll admitt I'm not actually sure if the spec requires this, or if gcc 4.5 was too picky, but this fixes the build with gcc 4.5, and it doesn't really hurt anything. bootstrapped + regtested on x86_64-unknown-linux-gnu with no regressions, ok? Trev gcc/ PR bootstrap/61679 * hash-table.h: use hash_table::value_type instead of Descriptor::value_type in the return types of several methods. diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 22af12f..9c6a34a 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -663,7 +663,7 @@ hash_table::~hash_table () HASH is the hash value for the element to be inserted. */ template class Allocator> -typename Descriptor::value_type ** +typename hash_table::value_type ** hash_table ::find_empty_slot_for_expand (hashval_t hash) { @@ -803,7 +803,7 @@ hash_table::clear_slot (value_type **slot) be used to insert or delete an element. */ template class Allocator> -typename Descriptor::value_type * +typename hash_table::value_type * hash_table ::find_with_hash (const compare_type *comparable, hashval_t hash) { @@ -841,7 +841,7 @@ hash_table entry, NULL may be returned if memory allocation fails. */ template class Allocator> -typename Descriptor::value_type ** +typename hash_table::value_type ** hash_table ::find_slot_with_hash (const compare_type *comparable, hashval_t hash, enum insert_option insert) @@ -922,7 +922,9 @@ hash_table template class Allocator> template + int (*Callback) (typename hash_table::value_type **slot, + Argument argument)> void hash_table::traverse_noresize (Argument argument) { @@ -946,7 +948,8 @@ hash_table::traverse_noresize (Argument argument) template class Allocator> template ::value_type **slot, Argument argument)> void hash_table::traverse (Argument argument) @@ -1181,7 +1184,7 @@ hash_table::~hash_table () HASH is the hash value for the element to be inserted. */ template class Allocator> -typename Descriptor::value_type * +typename hash_table::value_type * hash_table ::find_empty_slot_for_expand (hashval_t hash) { @@ -1321,7 +1324,7 @@ hash_table::clear_slot (value_type *slot) be used to insert or delete an element. */ template class Allocator> -typename Descriptor::value_type & +typename hash_table::value_type & hash_table ::find_with_hash (const compare_type &comparable, hashval_t hash) { @@ -1358,7 +1361,7 @@ hash_table entry, NULL may be returned if memory allocation fails. */ template class Allocator> -typename Descriptor::value_type * +typename hash_table::value_type * hash_table ::find_slot_with_hash (const compare_type &comparable, hashval_t hash, enum insert_option insert) @@ -1440,7 +1443,8 @@ hash_table template class Allocator> template::value_type *slot, Argument argument)> void hash_table::traverse_noresize (Argument argument) @@ -1465,7 +1469,8 @@ hash_table::traverse_noresize (Argument argument) template class Allocator> template ::value_type *slot, Argument argument)> void hash_table::traverse (Argument argument)