From patchwork Tue Oct 22 21:47:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1181692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-511531-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="leEpvGRV"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="eY3TA31k"; dkim-atps=neutral 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 46yRvR1N92z9sPf for ; Wed, 23 Oct 2019 08:48:00 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=SGZ5zy2jfS/niVVKr1gHrbxmNPaFJPmbEpVmIVnUEU3Jh1KQ19B+e 1zM3upSsbdpQJsjDqzZnRbUsyijXYJm5vW02Js5KN0MPSOUo1bz5Yv6JUj+Q6OBE 3XU9fAryIhr/7O0F6CE/rVdvYfQ3lRA2qqXntR4VxqSUkzKIaQE53U= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=ku39SmmgDbfEQIuoVbkzWLC0MuM=; b=leEpvGRV3mwHZcsgYujG j5KRC+zsoxWzwpCoe97DWZbc4l/QVWZgmntTdOfZ3vMEOXQB6ywDGVRIhb6SSEEj CZFC6bPfKh6GoobT5DBRByb8XiaTsUUVK4ZQOd3dsgLIjVrashf1exw6+OsSZefU GzT1tVo+wrObbh6qCDuBxnI= Received: (qmail 22624 invoked by alias); 22 Oct 2019 21:47:53 -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 22616 invoked by uid 89); 22 Oct 2019 21:47:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-1.mimecast.com Received: from us-smtp-delivery-1.mimecast.com (HELO us-smtp-1.mimecast.com) (207.211.31.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 22 Oct 2019 21:47:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571780870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=ZRo/2nVT6eRXZOTr/UkF1MrDpJP25z7p3qEDI494BQQ=; b=eY3TA31kSIAsR+PuBifdDSxbyx2GLa14G6Cl/QN1Dm1dHe0ughMnlysE2TxMrvRP7YCBmO oPK7i3pkFZCO8AWDKtx2PCofdE4g8mRjFvNFcLDxrYdtSpgYCiwZ2SKC/LgQ2/GO6f3Xk8 1ObJTEu4or3OtEMRCGxkyzujsHVCFRw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-369-KouYZuRSNpOUgtUNbKpglw-1; Tue, 22 Oct 2019 17:47:48 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9FA04800D49; Tue, 22 Oct 2019 21:47:47 +0000 (UTC) Received: from localhost (unknown [10.33.36.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EA704128; Tue, 22 Oct 2019 21:47:46 +0000 (UTC) Date: Tue, 22 Oct 2019 22:47:46 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] Restore use of tr1::unordered_map in testsuite Message-ID: <20191022214746.GA16611@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.12.1 (2019-06-15) X-Mimecast-Spam-Score: 0 Content-Disposition: inline My recent change to this file broke running the testsuite with -std=c++98 because std::unordered_map isn't available. This fixes it. * testsuite/util/testsuite_abi.h: Restore use of tr1/unordered_map when compiled as C++98. Tested x86_64-linux, committed to trunk. commit 8ffc60659009bfca2152c6e3af846d8700393ece Author: Jonathan Wakely Date: Tue Oct 22 22:45:42 2019 +0100 Restore use of tr1::unordered_map in testsuite My recent change to this file broke running the testsuite with -std=c++98 because std::unordered_map isn't available. This fixes it. * testsuite/util/testsuite_abi.h: Restore use of tr1/unordered_map when compiled as C++98. diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.h b/libstdc++-v3/testsuite/util/testsuite_abi.h index 8f6a89e8739..4edf833bd59 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.h +++ b/libstdc++-v3/testsuite/util/testsuite_abi.h @@ -22,7 +22,13 @@ #include #include #include -#include +#if __cplusplus >= 201103L +# include +namespace unord = std; +#else +# include +namespace unord = std::tr1; +#endif #include // Encapsulates symbol characteristics. @@ -65,7 +71,7 @@ struct symbol }; // Map type between symbol names and full symbol info. -typedef std::unordered_map symbols; +typedef unord::unordered_map symbols; // Check.