From 4cc3cdcb7ed8e813c6fe9d18c1ac5a235eb7077d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Wed, 20 Mar 2024 06:47:20 +0100 Subject: [PATCH] libstdc++: [_GLIBCXX_DEBUG] Define __cpp_lib_null_iterators _GLIBCXX_DEBUG has now fully N3344 compliant iterator checks, we can define __cpp_lib_null_iterators macros like the normal mode. libstdc++-v3/ChangeLog: * include/std/iterator (__cpp_lib_null_iterators): Define regardless of _GLIBCXX_DEBUG. * include/std/version (__cpp_lib_null_iterators): Likewise. --- libstdc++-v3/include/std/iterator | 2 +- libstdc++-v3/include/std/version | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/iterator b/libstdc++-v3/include/std/iterator index 695e18e2c472..a0a8eac570bf 100644 --- a/libstdc++-v3/include/std/iterator +++ b/libstdc++-v3/include/std/iterator @@ -67,7 +67,7 @@ #endif #include -#if __cplusplus >= 201402L && ! defined _GLIBCXX_DEBUG // PR libstdc++/70303 +#if __cplusplus >= 201402L # define __cpp_lib_null_iterators 201304L #endif diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index bd1bee0190d4..ee515c4e66ca 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -81,9 +81,7 @@ #define __cpp_lib_integral_constant_callable 201304L #define __cpp_lib_is_final 201402L #define __cpp_lib_make_reverse_iterator 201402L -#ifndef _GLIBCXX_DEBUG // PR libstdc++/70303 -# define __cpp_lib_null_iterators 201304L -#endif +#define __cpp_lib_null_iterators 201304L #define __cpp_lib_robust_nonmodifying_seq_ops 201304L #define __cpp_lib_transformation_trait_aliases 201304L #define __cpp_lib_transparent_operators 201510L -- 2.47.2