From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 29 May 2025 12:49:04 +0000 (+0100)
Subject: libstdc++: Add _GLIBCXX_USE_BUILTIN_TRAIT to Doxygen config
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72a98dc6e517eb7cdff1ac1cef11a18702aa6771;p=thirdparty%2Fgcc.git

libstdc++: Add _GLIBCXX_USE_BUILTIN_TRAIT to Doxygen config

This ensures that Doxygen sees the simpler definitions of type traits,
which are implemented using the built-ins.

Also add _GLIBCXX_HAVE_ICONV (which is less important) and fix some
typos for _GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE and
_GLIBCXX_END_INLINE_ABI_NAMESPACE.

libstdc++-v3/ChangeLog:

	* doc/doxygen/user.cfg.in (PREDEFINED): Remove -D prefixes from
	some macros. Define _GLIBCXX_USE_BUILTIN_TRAIT and
	_GLIBCXX_HAVE_ICONV macros.
---

diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in
index e926c6707f6..536e035b023 100644
--- a/libstdc++-v3/doc/doxygen/user.cfg.in
+++ b/libstdc++-v3/doc/doxygen/user.cfg.in
@@ -2350,8 +2350,8 @@ PREDEFINED             = __cplusplus=202002L \
                          "_GLIBCXX_END_NAMESPACE_CONTAINER= " \
                          "_GLIBCXX_END_NAMESPACE_CXX11= " \
                          "_GLIBCXX_END_NAMESPACE_LDBL= " \
-			 "-D_GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(X)= " \
-			 "-D_GLIBCXX_END_INLINE_ABI_NAMESPACE(X)= " \
+			 "_GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(X)= " \
+			 "_GLIBCXX_END_INLINE_ABI_NAMESPACE(X)= " \
                          "_GLIBCXX_TEMPLATE_ARGS=...  " \
                          "_GLIBCXX_DEPRECATED= " \
                          "_GLIBCXX_DEPRECATED_SUGGEST(E)= " \
@@ -2414,6 +2414,8 @@ PREDEFINED             = __cplusplus=202002L \
                          _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE \
                          _GLIBCXX_HAVE_IS_CONSTANT_EVALUATED \
                          _GLIBCXX_HAVE_BUILTIN_LAUNDER \
+			 "_GLIBCXX_USE_BUILTIN_TRAIT(X)=1" \
+			 _GLIBCXX_HAVE_ICONV=1 \
 			 "_GLIBCXX_DOXYGEN_ONLY(X)=X " \
 			 __exception_ptr=__unspecified__ \