From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 98BAD388E828 for ; Tue, 17 Aug 2021 13:27:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 98BAD388E828 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-218-IJgJQkALNH-L_3hbUHU5Zg-1; Tue, 17 Aug 2021 09:27:23 -0400 X-MC-Unique: IJgJQkALNH-L_3hbUHU5Zg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C3F7B801AC0; Tue, 17 Aug 2021 13:27:22 +0000 (UTC) Received: from localhost (unknown [10.33.36.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 707DD1AC80; Tue, 17 Aug 2021 13:27:22 +0000 (UTC) Date: Tue, 17 Aug 2021 14:27:21 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Only define basic_string::contains for C++23 Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="nsJ/C/2Dx6nQzbTh" Content-Disposition: inline X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2021 13:27:26 -0000 --nsJ/C/2Dx6nQzbTh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The new contains member of the COW string is defined for non-strict gnu++20 mode as well as for C++23 modes. I think that was left in the committed patch unintentionally. It is inconsistent with the SSO string, and doesn't actually compile because it uses the basic_string_view::contains member which only defined for C++23. This makes it only defined for C++23. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/cow_string.h (basic_string::contains): Do not define for -std=gnu++20. Tested powerpc64le-linux. Committed to trunk. --nsJ/C/2Dx6nQzbTh Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 3b3f2f7c265ef9f176cb811a8049b24538d954d9 Author: Jonathan Wakely Date: Mon Aug 16 20:42:54 2021 libstdc++: Only define basic_string::contains for C++23 The new contains member of the COW string is defined for non-strict gnu++20 mode as well as for C++23 modes. I think that was left in the committed patch unintentionally. It is inconsistent with the SSO string, and doesn't actually compile because it uses the basic_string_view::contains member which only defined for C++23. This makes it only defined for C++23. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/cow_string.h (basic_string::contains): Do not define for -std=gnu++20. diff --git a/libstdc++-v3/include/bits/cow_string.h b/libstdc++-v3/include/bits/cow_string.h index 5b09cc2a896..61edaa85484 100644 --- a/libstdc++-v3/include/bits/cow_string.h +++ b/libstdc++-v3/include/bits/cow_string.h @@ -2963,8 +2963,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return __sv_type(this->data(), this->size()).ends_with(__x); } #endif // C++20 -#if __cplusplus >= 202011L \ - || (__cplusplus == 202002L && !defined __STRICT_ANSI__) +#if __cplusplus > 202011L bool contains(basic_string_view<_CharT, _Traits> __x) const noexcept { return __sv_type(this->data(), this->size()).contains(__x); } --nsJ/C/2Dx6nQzbTh--