Thanks to you doc:

    libstdc++: [_GLIBCXX_DEBUG] Define __[glibcxx,cpp_lib]_null_iterators

    _GLIBCXX_DEBUG has now fully N3344 compliant iterator checks, we can define     __glibcxx_null_iterators and __cpp_lib_null_iterators macros like the normal
    mode.

    libstdc++-v3/ChangeLog:

            * version.def (null_iterators): Remove extra_cond.
            * version.h: Regenerate.

Ok to commit ?

I already noticed that GCC 13 has no version.h file so no backport question.

François

On 19/03/2024 16:41, Jonathan Wakely wrote:
On Tue, 19 Mar 2024 at 09:31, Jonathan Wakely wrote:
On Mon, 18 Mar 2024 at 21:38, François Dumont wrote:
Both committed now.

Just to confirm, those 2 last patches should be backported to gcc-13
branch, right ?
Yes please.

I might have a try to update version.h but if you want to do it before
don't hesitate.
You'll need to have 'autogen' installed to do it (I'm going to update
the docs to describe that today).
I've documented it in a new "Generated files" section at the end of
https://gcc.gnu.org/onlinedocs/libstdc++/manual/appendix_porting.html#build_hacking.generated
diff --git a/libstdc++-v3/include/bits/version.def 
b/libstdc++-v3/include/bits/version.def
index be5af18e818..26e62c6a9b2 100644
--- a/libstdc++-v3/include/bits/version.def
+++ b/libstdc++-v3/include/bits/version.def
@@ -209,7 +209,6 @@ ftms = {
   values = {
     v = 201304;
     cxxmin = 14;
-    extra_cond = "!defined(_GLIBCXX_DEBUG)";
   };
 };
 
diff --git a/libstdc++-v3/include/bits/version.h 
b/libstdc++-v3/include/bits/version.h
index 9107b45a484..23c8c09ab4b 100644
--- a/libstdc++-v3/include/bits/version.h
+++ b/libstdc++-v3/include/bits/version.h
@@ -214,7 +214,7 @@
 #undef __glibcxx_want_make_reverse_iterator
 
 #if !defined(__cpp_lib_null_iterators)
-# if (__cplusplus >= 201402L) && (!defined(_GLIBCXX_DEBUG))
+# if (__cplusplus >= 201402L)
 #  define __glibcxx_null_iterators 201304L
 #  if defined(__glibcxx_want_all) || defined(__glibcxx_want_null_iterators)
 #   define __cpp_lib_null_iterators 201304L

Reply via email to