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 ESMTPS id BBD4038555A4 for ; Wed, 22 Mar 2023 17:50:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BBD4038555A4 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679507407; 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=6aDcnlV+2sc2a/NHutKF612zVSpW9JQT7Hgp49aTIfs=; b=Tk1JfGhiyjrXHwCRYisdot1BZCACl5EEQQnRMjaeFU3l8dvCDi4h+m4NSzhcsFE2Suhp7Q PPSqVeNf4YnyTzsDTWOfJkFx9HxqY+wdB6XZIIHS7IgAmYnoY+hty107HXHiqVdopQADmD jlfPOe6cEDPZYKHi4SP4sxLQ+DIyEik= 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-64-SPoweCEWPlK_xo-09PsBWA-1; Wed, 22 Mar 2023 13:50:04 -0400 X-MC-Unique: SPoweCEWPlK_xo-09PsBWA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 268B93C0E468; Wed, 22 Mar 2023 17:50:04 +0000 (UTC) Received: from localhost (unknown [10.33.36.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1C4D51FF; Wed, 22 Mar 2023 17:50:03 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add missing __cpp_lib_format macro to Date: Wed, 22 Mar 2023 17:50:03 +0000 Message-Id: <20230322175003.408005-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.1 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_H2,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 List-Id: Tested powerpc64le-linux, pushed to trunk. -- >8-- libstdc++-v3/ChangeLog: * include/std/version (__cpp_lib_format): Define. * testsuite/std/format/functions/format.cc: Check it. --- libstdc++-v3/include/std/version | 1 + .../testsuite/std/format/functions/format.cc | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 25ebfc3e512..a19c39c6cdd 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -277,6 +277,7 @@ #define __cpp_lib_constexpr_utility 201811L #define __cpp_lib_constexpr_vector 201907L #define __cpp_lib_erase_if 202002L +#define __cpp_lib_format 202106L #define __cpp_lib_generic_unordered_lookup 201811L #define __cpp_lib_interpolate 201902L #ifdef _GLIBCXX_HAS_GTHREADS diff --git a/libstdc++-v3/testsuite/std/format/functions/format.cc b/libstdc++-v3/testsuite/std/format/functions/format.cc index 7a155208a48..2a1b1560394 100644 --- a/libstdc++-v3/testsuite/std/format/functions/format.cc +++ b/libstdc++-v3/testsuite/std/format/functions/format.cc @@ -2,6 +2,21 @@ // { dg-do run { target c++20 } } #include + +#ifndef __cpp_lib_format +# error "Feature test macro for std::format is missing in " +#elif __cpp_lib_format < 202106L +# error "Feature test macro for std::format has wrong value in " +#endif + +#undef __cpp_lib_format +#include +#ifndef __cpp_lib_format +# error "Feature test macro for std::format is missing in " +#elif __cpp_lib_format < 202106L +# error "Feature test macro for std::format has wrong value in " +#endif + #include #include #include -- 2.39.2