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 580BE3858D38 for ; Mon, 17 Apr 2023 03:45:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 580BE3858D38 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=1681703148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5hymaym0MzHv3Y1KsFD91gEIP6a0u59aLhVPzKUoe0Y=; b=i3gNKCoe7JmKjOsCIaocZ5H4Bwc0lMKggcGaFF3RT6B1GEQP0ezxF8+rOQ7mvojbEeOHIq 2BAltIrP8mzUpCAqHLQz735l1PYUDiZqw7J2I/CZtkcaH6LpiEATuKdZsP37SUzTMgapYs S87WBEWaeoFB7+tGdNN4PZVQHH62SrE= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-82-PJwC6k5wP2WYBjB0XvMgxw-1; Sun, 16 Apr 2023 23:45:47 -0400 X-MC-Unique: PJwC6k5wP2WYBjB0XvMgxw-1 Received: by mail-qt1-f198.google.com with SMTP id v24-20020a05622a189800b003e0e27bbc2eso17115450qtc.8 for ; Sun, 16 Apr 2023 20:45:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681703146; x=1684295146; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5hymaym0MzHv3Y1KsFD91gEIP6a0u59aLhVPzKUoe0Y=; b=bB+dwSuc4nUES0v2D2z27pgTBy4R0LyRhuRz3NIIKu5vBvHlXkTNLiHTza2L7HF9Zx cEU5DaHvNL7IDBoaFqR1puJ/V6K0tLXTxuleKxQr7VGXiwo33/2kxGE+PnIeJggw+f9h I0cRFonvqbGs8k2oitm6V/mV/6QAC3t84Eie9bfL6jxS/Z6fZGtzq82PH9u3z8t0y+hP cAT98bl3QZrohOvwd49T8/FUpl8kEmL23k20gkAFxHz0l60RKAB0OaphAW98CCqOOefO 00p603XLTG6W4rJgKNm+li3cCS5XimwoKg5NU+uwXsQOwB9j3k7aYusHyQCP8437QdFY D1Cg== X-Gm-Message-State: AAQBX9eNPEhfer8LnU1/AIkIz+86/3C3XaItMfedcFlYwsyJyHGCwwj6 lQbiZZcauwM/v8BQVgxhBcwyhGxY/WSnrdFuOEciHDfYKeGbc1T7ZB4GdbUa7Zh5TBQfTlPtrVQ 4Eo+qqwyeE+V0hSaB3F/xnW0= X-Received: by 2002:a05:6214:509c:b0:5ef:5be2:f6d0 with SMTP id kk28-20020a056214509c00b005ef5be2f6d0mr13183681qvb.6.1681703146292; Sun, 16 Apr 2023 20:45:46 -0700 (PDT) X-Google-Smtp-Source: AKy350biefDn339wGraptndCFGl/kti6W0yNPWH4TG/oh9fDRzrqKD8/utD/Es10vzTfzS4HamtiSw== X-Received: by 2002:a05:6214:509c:b0:5ef:5be2:f6d0 with SMTP id kk28-20020a056214509c00b005ef5be2f6d0mr13183671qvb.6.1681703146052; Sun, 16 Apr 2023 20:45:46 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id bz15-20020ad44c0f000000b005ef608dc422sm1491885qvb.41.2023.04.16.20.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 20:45:45 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Adding missing feature-test macros for C++23 ranges algos Date: Sun, 16 Apr 2023 23:45:40 -0400 Message-ID: <20230417034540.2645965-1-ppalka@redhat.com> X-Mailer: git-send-email 2.40.0.335.g9857273be0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.7 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This patch also renames __cpp_lib_fold to __cpp_lib_ranges_fold as per the current draft standard. libstdc++-v3/ChangeLog: * include/bits/ranges_algo.h (__cpp_lib_ranges_contains): Define for C++23. (__cpp_lib_ranges_iota): Likewise. (__cpp_lib_ranges_find_last): Likewise. (__cpp_lib_fold): Rename to ... (__cpp_lib_ranges_fold): ... this. * include/std/version: As above. * testsuite/25_algorithms/fold_left/1.cc: Adjust after renaming __cpp_lib_fold. * testsuite/std/ranges/version_c++23.cc: Verify values of the above feature-test macros. --- libstdc++-v3/include/bits/ranges_algo.h | 9 ++++++++- libstdc++-v3/include/std/version | 5 ++++- .../testsuite/25_algorithms/fold_left/1.cc | 4 ++-- .../testsuite/std/ranges/version_c++23.cc | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h index f041ff16b0e..410d3ae1dd8 100644 --- a/libstdc++-v3/include/bits/ranges_algo.h +++ b/libstdc++-v3/include/bits/ranges_algo.h @@ -3468,6 +3468,9 @@ namespace ranges inline constexpr __prev_permutation_fn prev_permutation{}; #if __cplusplus > 202002L + +#define __cpp_lib_ranges_contains 202207L + struct __contains_fn { template _Sent, @@ -3521,6 +3524,8 @@ namespace ranges inline constexpr __contains_subrange_fn contains_subrange{}; +#define __cpp_lib_ranges_iota 202202L + template struct out_value_result { @@ -3569,6 +3574,8 @@ namespace ranges inline constexpr __iota_fn iota{}; +#define __cpp_lib_ranges_find_last 202207L + struct __find_last_fn { template _Sent, typename _Tp, typename _Proj = identity> @@ -3695,7 +3702,7 @@ namespace ranges inline constexpr __find_last_if_not_fn find_last_if_not{}; -#define __cpp_lib_fold 202207L +#define __cpp_lib_ranges_fold 202207L template struct in_value_result diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 9f31f25f1e9..027e5711ec5 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -341,7 +341,10 @@ #define __cpp_lib_ranges_as_rvalue 202207L #define __cpp_lib_ranges_as_const 202207L #define __cpp_lib_ranges_enumerate 202302L -#define __cpp_lib_fold 202207L +#define __cpp_lib_ranges_contains 202207L +#define __cpp_lib_ranges_iota 202202L +#define __cpp_lib_ranges_find_last 202207L +#define __cpp_lib_ranges_fold 202207L #if __cpp_constexpr_dynamic_alloc # if _GLIBCXX_HOSTED # define __cpp_lib_constexpr_bitset 202202L diff --git a/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc b/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc index 5cc91b67d27..4041d13315f 100644 --- a/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc @@ -5,8 +5,8 @@ #include #include -#if __cpp_lib_fold != 202207L -# error "Feature-test macro __cpp_lib_fold has wrong value in " +#if __cpp_lib_ranges_fold != 202207L +# error "Feature-test macro __cpp_lib_ranges_fold has wrong value in " #endif namespace ranges = std::ranges; diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc index e2c14edc8ef..04609bb602c 100644 --- a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc +++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc @@ -52,3 +52,19 @@ #if __cpp_lib_ranges_enumerate != 202302L # error "Feature-test macro __cpp_lib_ranges_enumerate has wrong value in " #endif + +#if __cpp_lib_ranges_contains != 202207L +# error "Feature-test macro __cpp_lib_ranges_contains has wrong value in " +#endif + +#if __cpp_lib_ranges_iota != 202202L +# error "Feature-test macro __cpp_lib_ranges_iota has wrong value in " +#endif + +#if __cpp_lib_ranges_find_last != 202207L +# error "Feature-test macro __cpp_lib_ranges_find_last has wrong value in " +#endif + +#if __cpp_lib_ranges_fold != 202207L +# error "Feature-test macro __cpp_lib_ranges_fold has wrong value in " +#endif -- 2.40.0.335.g9857273be0