From patchwork Fri Jun 10 13:32:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 55010 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 38FAE388879A for ; Fri, 10 Jun 2022 13:32:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38FAE388879A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1654867960; bh=iyFnQHh0gr+PbdH4Wt0zfhW2LD8Fzr8lvMBNBjoaS/U=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=XveKacQYrXV7kcVAr23ozzeUMY3qQZb6p0ws19MzDlrELVwd3cHoOj70HsjZ9AcVf a/ERRFP2h33g5ttFi29tL/+Fk3HIrFLXRaJT8p9ROm3LREn4ricXrC0i/vcRApoA26 sYdhpulz4Og/ZAvxCxPNOIlNEtriz6lTVeAvNyBc= 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 ESMTPS id EA68A3829BF9 for ; Fri, 10 Jun 2022 13:32:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EA68A3829BF9 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-144-6S1r6lAOMPuBxfdDldY50A-1; Fri, 10 Jun 2022 09:32:07 -0400 X-MC-Unique: 6S1r6lAOMPuBxfdDldY50A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3EC5180013E; Fri, 10 Jun 2022 13:32:07 +0000 (UTC) Received: from localhost (unknown [10.33.36.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0908740CF8EF; Fri, 10 Jun 2022 13:32:06 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Partially revert r11-9772-g6f8133689f4397 [PR105915] Date: Fri, 10 Jun 2022 14:32:06 +0100 Message-Id: <20220610133206.657035-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" I have done a partial revert on the gcc-11 branch to fix PR105915. I'll also backport it to gcc-10 after testing finishes. -- >8 -- The r11-9772-g6f8133689f4397 backport made two changes, but only one was needed on the gcc-11 branch. The other should not have been backported, and causes errors with clang. This removes the unwanted part. libstdc++-v3/ChangeLog: PR libstdc++/105915 * include/experimental/bits/fs_path.h (path::begin, path::end): Remove noexcept from declarations. --- libstdc++-v3/include/experimental/bits/fs_path.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h index 1cc1b3bf686..a2bc931c696 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -425,8 +425,8 @@ namespace __detail class iterator; typedef iterator const_iterator; - iterator begin() const noexcept; - iterator end() const noexcept; + iterator begin() const; + iterator end() const; /// @cond undocumented // Create a basic_string by reading until a null character.