From patchwork Fri Jun 21 09:23:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1950669 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=gTEGwL0V; 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 4W5Bl752b2z20X6 for ; Fri, 21 Jun 2024 19:24:35 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EFE3238983BD for ; Fri, 21 Jun 2024 09:24:33 +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 ESMTPS id 1762E389838A for ; Fri, 21 Jun 2024 09:23:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1762E389838A 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 1762E389838A 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=1718961831; cv=none; b=swR5o35DfLCooUNIaB/ZWDxpTzd0gXOJpPNo6KgzvbeDz74SMUw/8OXu3/kQoxqOCHV/LNweendTDIa7LTm9AJTNsoiDgYFIib7U2A57Q5LMjAWC+a5RJj/xDKlHLkZNLxvXuw38n7GMoj+j6Tv1y+qEpHcwl2fzsqp8XuU/tDc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718961831; c=relaxed/simple; bh=Me0WlKIGZ8cnBjaY8p5/NI7pYgQc8PHdFXli+kzgbnE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=rY6k61lOMbHgmS0Q9zKoJoPF352hBZi6yz6w66HGxCc6/sW5E+7l/cj56JOhWtLKns8sEYHvBsrPcsWx1ACFBxkPcRQha57sjVqbiT3sfcKPhGMPB+M3ckOnFjkLWyJMeF3BPLcP1kZpbM5ArglDzbI/kEjEr+MprmnMx+C4oNg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718961829; 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=kohW0OPtWoRxKGzTZhcrInODtza+Ze0ozLBAhUpt6Js=; b=gTEGwL0VqPO6tTizCSaqvEDEmj5IgfZi1NMR0DPDXW/JnMj7uz6yz7rK4P2TmZGt8NEWAz lbuaHVoqWoO7PYc2P+CK9BEgxSMrX/wTJ23zoVqfRTyefiqsfCDXSEWP3r9rMLcKME8uWa SByEDOEJz7dw2U5MtVh1fldGkkwcn1Y= Received: from mx-prod-mc-01.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-632-iul56-t-OmSVKoouMVGwhA-1; Fri, 21 Jun 2024 05:23:44 -0400 X-MC-Unique: iul56-t-OmSVKoouMVGwhA-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E78E919560B0; Fri, 21 Jun 2024 09:23:41 +0000 (UTC) Received: from localhost (unknown [10.42.28.182]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6CB613000218; Fri, 21 Jun 2024 09:23:41 +0000 (UTC) From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [committed] libstdc++: Qualify calls in to prevent ADL Date: Fri, 21 Jun 2024 10:23:02 +0100 Message-ID: <20240621092340.2205626-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 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 autolearn=unavailable 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. Probably worth backporting. -- >8 -- libstdc++-v3/ChangeLog: * include/bits/stl_uninitialized.h (uninitialized_default_construct) (uninitialized_default_construct_n, uninitialized_value_construct) (uninitialized_value_construct_n): Qualify calls to prevent ADL. --- libstdc++-v3/include/bits/stl_uninitialized.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h index 7f84da31578..3c405d8fbe8 100644 --- a/libstdc++-v3/include/bits/stl_uninitialized.h +++ b/libstdc++-v3/include/bits/stl_uninitialized.h @@ -975,7 +975,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION uninitialized_default_construct(_ForwardIterator __first, _ForwardIterator __last) { - __uninitialized_default_novalue(__first, __last); + std::__uninitialized_default_novalue(__first, __last); } /** @@ -989,7 +989,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline _ForwardIterator uninitialized_default_construct_n(_ForwardIterator __first, _Size __count) { - return __uninitialized_default_novalue_n(__first, __count); + return std::__uninitialized_default_novalue_n(__first, __count); } /** @@ -1003,7 +1003,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION uninitialized_value_construct(_ForwardIterator __first, _ForwardIterator __last) { - return __uninitialized_default(__first, __last); + return std::__uninitialized_default(__first, __last); } /** @@ -1017,7 +1017,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline _ForwardIterator uninitialized_value_construct_n(_ForwardIterator __first, _Size __count) { - return __uninitialized_default_n(__first, __count); + return std::__uninitialized_default_n(__first, __count); } /**