Hello, Thank you for the review!
On 27/03/2025 11:38, Jonathan Wakely wrote:
With the inplace_merge and stable_partition patches approved, can you bump it again now? That would presumably resolve PR 119488.
Sure thing; is the attached patch OK (on top of the other two)? Thank you, -- Giuseppe D'Angelo
From cdc4ad8e628f68f5c78001828380a2055c539bbe Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dang...@kdab.com>
Date: Thu, 27 Mar 2025 12:48:26 +0100
Subject: [PATCH] libstdc++: re-bump the feature-test macro for P2562R1
[PR119488]
Now that the algorithms have been merged we can advertise full support
for P2562R1. This effectively reverts r15-8933-ga264c270fde292.
libstdc++-v3/ChangeLog:
PR libstdc++/119488
* include/bits/version.def (constexpr_algorithms): Bump
the feature-testing macro.
* include/bits/version.h: Regenerate.
* testsuite/25_algorithms/cpp_lib_constexpr.cc: Test the
bumped value for the feature-testing macro.
Signed-off-by: Giuseppe D'Angelo <giuseppe.dang...@kdab.com>
---
libstdc++-v3/include/bits/version.def | 2 +-
libstdc++-v3/include/bits/version.h | 4 ++--
libstdc++-v3/testsuite/25_algorithms/cpp_lib_constexpr.cc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def
index 7ef60af39de..1468c0491b7 100644
--- a/libstdc++-v3/include/bits/version.def
+++ b/libstdc++-v3/include/bits/version.def
@@ -1117,7 +1117,7 @@ ftms = {
ftms = {
name = constexpr_algorithms;
values = {
- v = 202305;
+ v = 202306;
cxxmin = 26;
};
values = {
diff --git a/libstdc++-v3/include/bits/version.h b/libstdc++-v3/include/bits/version.h
index a96ff49efa4..f7c9849893d 100644
--- a/libstdc++-v3/include/bits/version.h
+++ b/libstdc++-v3/include/bits/version.h
@@ -1257,9 +1257,9 @@
#if !defined(__cpp_lib_constexpr_algorithms)
# if (__cplusplus > 202302L)
-# define __glibcxx_constexpr_algorithms 202305L
+# define __glibcxx_constexpr_algorithms 202306L
# if defined(__glibcxx_want_all) || defined(__glibcxx_want_constexpr_algorithms)
-# define __cpp_lib_constexpr_algorithms 202305L
+# define __cpp_lib_constexpr_algorithms 202306L
# endif
# elif (__cplusplus >= 202002L)
# define __glibcxx_constexpr_algorithms 201806L
diff --git a/libstdc++-v3/testsuite/25_algorithms/cpp_lib_constexpr.cc b/libstdc++-v3/testsuite/25_algorithms/cpp_lib_constexpr.cc
index 3e5e55252fc..3f60e996115 100644
--- a/libstdc++-v3/testsuite/25_algorithms/cpp_lib_constexpr.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/cpp_lib_constexpr.cc
@@ -23,7 +23,7 @@
#ifndef __cpp_lib_constexpr_algorithms
# error "Feature-test macro for constexpr algorithms missing"
#elif __cplusplus > 202302L
-# if __cpp_lib_constexpr_algorithms < 202305L
+# if __cpp_lib_constexpr_algorithms < 202306L
# error "Feature-test macro for constexpr algorithms has wrong value"
# endif
#elif __cpp_lib_constexpr_algorithms < 201806L
--
2.34.1
smime.p7s
Description: S/MIME Cryptographic Signature
