From patchwork Tue Aug 20 20:56:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1974600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CiafyEAf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WpMG815dPz1yXf for ; Wed, 21 Aug 2024 06:56:48 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CDB543870864 for ; Tue, 20 Aug 2024 20:56:45 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 82B983858420 for ; Tue, 20 Aug 2024 20:56:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 82B983858420 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 82B983858420 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724187384; cv=none; b=edLiZ+ZGO5UwVQcWpj8I2EjByJ2k6vmk724RJ+h656efxziKSxcISGAhrG9mXwaDzH9LV6V6IcT87qOME+b+tfsQmzQxTGznlyeb7p/7xq/Lc5+ONkg6it3xAmNiQiO+41SYbBKvnEQHEdbQ2dHGEdV7/XjntVHqAoA+DYfCvZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724187384; c=relaxed/simple; bh=Sp6Q+l+OPaMNrG56BRVsxqvq4YNCZoFV+TznurN1P9I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=StYorPijAh1UkJuDMGht62vyna8TVsGHy8JlHv6C5W41BZQhpEWZVtA47yGYOt0aSsvsSNrzjskYT8RFFihAgQJUe/P1SeqDvKg27Kwpf1pNZBaS31dBVWBehsHDgLH6CEd1QlT5kXHZOgw6LIEFNDH7weO8VqKygCTX9YRULGE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724187382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g83RBUFNY5ya0jjshHVjRHCJFXJ0mlMuKssQnP5dRpA=; b=CiafyEAfiZVx9APVyvl3mfEZ9n+yYgKHMxQ8sOB/8SXSNhTjTEgW5cxkSZ5ch3p7o25Loy dm84WScL1+szMRMUW++s174F7asvZbOYruTxyyVwzciHW+L82R763vsitDm1+uqVliLgRJ 7TBtkqV/qSFsC1HFyyIZCLcPWmLnyX0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-502-CJmgRrA1OYeRfuMKD6X0og-1; Tue, 20 Aug 2024 16:56:21 -0400 X-MC-Unique: CJmgRrA1OYeRfuMKD6X0og-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 03B3E1955D4B; Tue, 20 Aug 2024 20:56:19 +0000 (UTC) Received: from localhost (unknown [10.42.28.148]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3EA891955F54; Tue, 20 Aug 2024 20:56:17 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove redundant reclaration of std::optional Date: Tue, 20 Aug 2024 21:56:01 +0100 Message-ID: <20240820205617.306724-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-linux. Pushed to trunk. -- >8 -- We've already declared optional at the top of the header, so don't need to do it again. libstdc++-v3/ChangeLog: * include/std/optional: Remove redundant redeclaration. --- libstdc++-v3/include/std/optional | 3 --- 1 file changed, 3 deletions(-) diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 2c4cc260f90..6651686cd1d 100644 --- a/libstdc++-v3/include/std/optional +++ b/libstdc++-v3/include/std/optional @@ -741,9 +741,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; #endif // __cpp_concepts - template - class optional; - template inline constexpr bool __is_optional_v = false; template