From patchwork Fri May 12 13:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 93210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5119139vqo; Fri, 12 May 2023 06:47:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6+DvmDz64QuoAX7yccCSvlCMsEg6BkQY0EZ6Hxyz37ltBb4CQogSHwMhtjQ4e1YcN9vpEX X-Received: by 2002:aa7:cc8b:0:b0:50b:d2f2:43f with SMTP id p11-20020aa7cc8b000000b0050bd2f2043fmr17585577edt.35.1683899255465; Fri, 12 May 2023 06:47:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683899255; cv=none; d=google.com; s=arc-20160816; b=b9FFpW8xVINLloLilUvZZysY+JRJSpTzQAFtkhgg4ZSdOVSUYLoUsuNbZCyz8SUGnH 2fi+QvpoSeiUVhRweFhkg/nXgyU4KZLeJnr5mHheO15duMU3iUhqAl0M9/NZ0rGoxUp8 Fdl+FRphk1yTa45Ig9ic9HX0HzGe2NKGqvvqhEb7lPrj48eJhyoAcoP7Ea9A3/93VfcH KEbADMkvbgnVIJhhBnNU9xRAbP9ktUFKdnhXGC+GxbiCCsrJ2dtWifEYJxxwJ+V8YNmw OqS+iSrswbhE3T9IYE7nUuEUK6Jei1WSL/RPmHKVTmP7yrSWzsEu0DFYxzn+BJZNMFF6 RLRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=cT+KsOyjmWVGqEIm48sQ0Bs2X6PiFKIpLNnldjTKpyw=; b=0izx+Ry0n0FrYqQN9wbaITZpGG/IpzWeD/JeovS0Y31wO3act5Qa7Fjfr2ejacqaha ZKwqxBbg7daMzGhKHt4gc2gs9dwTspUuU8L0EsScU1t2DcNrZWFtayXILiv+4EgP/z9F E5o0LGaWjLqvakZJmhQd7y4qGDj/nmOgJERHVaDc3Trj59ET/k9m4OgmAiOlgpx7M5g3 W2xA7jR2cork5m2Om0fDbtynfvBSjRC5tFyKgMLsS42v9bRuF2Y1I+XpgVKrJOc41mx7 2x6t9bBJu4INoxaXpocZ5K4L26/sbR1Y8gCtLFegmgORS+B8mXOuFLLVj0Vb2r70Y3H8 8kBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="n+/F7ed8"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id g14-20020aa7c58e000000b0050ca8c906a3si7208250edq.48.2023.05.12.06.47.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 06:47:35 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="n+/F7ed8"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1FD4B385356B for ; Fri, 12 May 2023 13:46:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1FD4B385356B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1683899179; bh=cT+KsOyjmWVGqEIm48sQ0Bs2X6PiFKIpLNnldjTKpyw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=n+/F7ed8cx/7LEBCdJkbK3PGvaKOFnk1kvYgG+pJiyueQ7vX1BcN3Mmt9WldRmw7r 1lY2vghtvC3W2wxQSw+IDkLeybqh7joTN4gReY+1yXcmJf3/7jUK/y1R4gDgNDOGB4 p/J72A7FkejfdHFaJDORi+D7T48xzsh58NlgaAMI= 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 DC6293856089 for ; Fri, 12 May 2023 13:44:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC6293856089 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-290-SMEsugGXPQeHVnCEaTddJg-1; Fri, 12 May 2023 09:44:36 -0400 X-MC-Unique: SMEsugGXPQeHVnCEaTddJg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 001561C05EA1; Fri, 12 May 2023 13:44:36 +0000 (UTC) Received: from localhost (unknown [10.42.28.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCA34492B07; Fri, 12 May 2023 13:44:35 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove test dependency on _GLIBCXX_USE_C99_STDINT_TR1 Date: Fri, 12 May 2023 14:44:35 +0100 Message-Id: <20230512134435.1291779-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765696319798777192?= X-GMAIL-MSGID: =?utf-8?q?1765696345791009981?= Tested x86_64-linux. Pushed to trunk. -- >8 -- This should have been removed in r9-2029-g612c9c702e2c9e when the char16_t and char32_t specializations of std::codecvt were changed to be defined unconditionally. libstdc++-v3/ChangeLog: * testsuite/22_locale/locale/cons/unicode.cc: Remove dependency on _GLIBCXX_USE_C99_STDINT_TR1. --- libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc index 0520b637be5..7fbbcae2aa3 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc @@ -33,14 +33,12 @@ typedef std::codecvt c_codecvt; typedef std::codecvt w_codecvt; #endif -#ifdef _GLIBCXX_USE_C99_STDINT_TR1 typedef std::codecvt u16_codecvt; typedef std::codecvt u32_codecvt; #ifdef _GLIBCXX_USE_CHAR8_T typedef std::codecvt u16u8_codecvt; typedef std::codecvt u32u8_codecvt; #endif -#endif class gnu_facet: public std::locale::facet { @@ -69,13 +67,11 @@ void test01() #ifdef _GLIBCXX_USE_WCHAR_T VERIFY( has_facet(loc13) ); #endif -#ifdef _GLIBCXX_USE_C99_STDINT_TR1 VERIFY( has_facet(loc13) ); VERIFY( has_facet(loc13) ); #ifdef _GLIBCXX_USE_CHAR8_T VERIFY( has_facet(loc13) ); VERIFY( has_facet(loc13) ); -#endif #endif VERIFY( has_facet(loc13) ); }