From patchwork Mon Mar 25 12:14:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1915545 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=d5ZwoniA; 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 4V3Bjt0L9zz1yWy for ; Mon, 25 Mar 2024 23:16:18 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3E98D3858429 for ; Mon, 25 Mar 2024 12:16:16 +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 BE18D385842F for ; Mon, 25 Mar 2024 12:15:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BE18D385842F 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 BE18D385842F 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=1711368918; cv=none; b=suFVCCM5EeFXJRjydfRbc4n2LizxC+CUTQtK6Pp0/1e6XRUYzlo1yHERtAK53wCBJbLcBSaNOeAP51f2vc/wjwlwpsh+67cYV9pGl7JnGRQzSPW25SAqFOqYEDc5sLY5jgA/O/V9b9r/B0s85zGZm8IYXrMZgXWeovGLdGaPzSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711368918; c=relaxed/simple; bh=4El8XEEOxW+V1pS4YwViNnPxZ4Ulg4fZGb4RBrfK0O0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Y0zaBfC7O3gXC9glf1imH8j30va7a3mkw2ERlEJvzASYzzhWzqNOPX6atI9V163qfe831U4svr6Lj0C9pkfxOX3F97jfzJebotoN7CVSgYMckJvYBSM594kh6HQa9OTUNT36OcW1TkM/JJxmefEnNYYooOVpywQVum48jFzliAQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711368915; 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=IsGUloTU9vb5DkRtW/iL8s8TPsRCK0kt6Vs8ZhF3+8A=; b=d5ZwoniAiVhrMLTqLCurGKdhlWs3E8cnfB83e7IT9n+7NFs13BimaztOYdCC4zzdPHWfDU r6S3A4LlNkdevGFKFejw/CG7Ivytenh5sCWCTaovRQjtNWeEHTowjzqsUdbO7DoahCA2Wg oTLc0TV6Jg6vfOA4GKPq2RdxJJ0p6fA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-xQUcmtlHP7qeupiLy2xrTA-1; Mon, 25 Mar 2024 08:15:12 -0400 X-MC-Unique: xQUcmtlHP7qeupiLy2xrTA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE41980026E; Mon, 25 Mar 2024 12:15:11 +0000 (UTC) Received: from localhost (unknown [10.42.28.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CB011C060A6; Mon, 25 Mar 2024 12:15:11 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix incorrect macro used in #undef in test Date: Mon, 25 Mar 2024 12:14:51 +0000 Message-ID: <20240325121507.523157-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 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, 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 aarch64-linux. Puhed to trunk. -- >8 -- This was a copy & paste error. libstdc++-v3/ChangeLog: * testsuite/std/text_encoding/requirements.cc: #undef the correct macro. --- libstdc++-v3/testsuite/std/text_encoding/requirements.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/std/text_encoding/requirements.cc b/libstdc++-v3/testsuite/std/text_encoding/requirements.cc index a1d5d6baee1..6cd71b68225 100644 --- a/libstdc++-v3/testsuite/std/text_encoding/requirements.cc +++ b/libstdc++-v3/testsuite/std/text_encoding/requirements.cc @@ -8,7 +8,7 @@ # error "Feature-test macro for text_encoding has wrong value in " #endif -#undef __cpp_lib_expected +#undef __cpp_lib_text_encoding #include #ifndef __cpp_lib_text_encoding # error "Feature-test macro for text_encoding missing in "