From patchwork Thu Oct 3 11:30:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1992312 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=FYK0FWB8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4XK8dq6Yy8z1xt1 for ; Thu, 3 Oct 2024 21:31:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2074338650EA for ; Thu, 3 Oct 2024 11:31:42 +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.129.124]) by sourceware.org (Postfix) with ESMTP id CDAA1385DDC6 for ; Thu, 3 Oct 2024 11:31:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CDAA1385DDC6 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 CDAA1385DDC6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727955074; cv=none; b=Mig1QasK8atT+For8SkxC7tmasvDozVTkbyuzNbTbO0fKxY5MH+686l6dWIC+7m+jragK9p47TDuHC+vrmfI8alIdOj3rgDkRgDSttHqD/ooyiehugpvckSFLEPn72jyRCfhdGh/UGDbJAlTXqwWUkKQ6MzBRuoblH9TzXs5E18= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727955074; c=relaxed/simple; bh=adrmVEH6gLuobo9HNAgdeSDVz2t3p2Bd/AHZNwWm1Io=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Cw61cngutF6va53MZRY09zNYypDQb9nyupJF63i6hc5RNIvtQv05iDgjtKcef3RQ00UsBzgcdkDMMCpFrek+XH2GtPGAtbTK5aBTgrMLlWKZ3VjfsP/yr7xDqNCyMMpbKt1rw7pK25rs5bcK+Or3wGfe4TTWos4jHGk62CVtTxY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727955072; 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=NetDf0q1BDztc9EdJIARyDQur6WvL4zYywypoozF97s=; b=FYK0FWB8Q8ChK+yqcnXwb6l0kY3KbWeRTVC2h8QLngW72bN4vjy4IZoX6RqEnpcFUID9Sg Qic+1OBtV/gfNMdlbwAZTckqApPoNB7mf44yI5iN6xfkl3j2SF6qUrNy4yJzrep0OobRcw LnFhpwBqE8NZh5QHUwdWgD+rVAbXyKM= Received: from mx-prod-mc-04.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-345-ZJ4e6vZrMqmTewRO91ymkQ-1; Thu, 03 Oct 2024 07:31:11 -0400 X-MC-Unique: ZJ4e6vZrMqmTewRO91ymkQ-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 42F9A1955F45; Thu, 3 Oct 2024 11:31:09 +0000 (UTC) Received: from localhost (unknown [10.42.28.136]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9BBF61956086; Thu, 3 Oct 2024 11:31:07 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Make Unicode utils work with Parallel Mode Date: Thu, 3 Oct 2024 12:30:58 +0100 Message-ID: <20241003113106.3523595-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 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_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP 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 -- libstdc++-v3/ChangeLog: * include/bits/unicode.h (__unicode::__is_incb_linker): Use _GLIBCXX_STD_A namespace for std::find. --- libstdc++-v3/include/bits/unicode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/unicode.h b/libstdc++-v3/include/bits/unicode.h index a14a17c5dfc..1232f60037c 100644 --- a/libstdc++-v3/include/bits/unicode.h +++ b/libstdc++-v3/include/bits/unicode.h @@ -625,7 +625,7 @@ inline namespace __v15_1_0 { const auto __end = std::end(__incb_linkers); // Array is small enough that linear search is faster than binary search. - return std::find(__incb_linkers, __end, __c) != __end; + return _GLIBCXX_STD_A::find(__incb_linkers, __end, __c) != __end; } // @pre c <= 0x10FFFF