FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix Doxygen commands

Browse source 
Remove the bogus -D__allocator_base=std::__new_allocator macro
definition for Doxygen, because that's an alias template for C++11 and
later, not a macro.

Fix the @cond/@endcond pair that span the end of an @addtogroup group.
Add another @endcond inside the group, and another @cond after it.

libstdc++-v3/ChangeLog:

	* doc/doxygen/user.cfg.in (PREDEFINED): Remove __allocator_base.
	* include/bits/allocator.h: Fix nesting of Doxygen commands.
This commit is contained in:
Jonathan Wakely 2022-09-16 11:36:41 +01:00
parent 39dc66558e
commit 64f9580423
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libstdc++-v3/doc/doxygen/user.cfg.in
View file

@ -2407,7 +2407,6 @@ PREDEFINED = __cplusplus=202002L \
_GLIBCXX_HAVE_IS_CONSTANT_EVALUATED \ _GLIBCXX_HAVE_IS_CONSTANT_EVALUATED \
_GLIBCXX_HAVE_BUILTIN_LAUNDER \ _GLIBCXX_HAVE_BUILTIN_LAUNDER \
"_GLIBCXX_DOXYGEN_ONLY(X)=X " \ "_GLIBCXX_DOXYGEN_ONLY(X)=X " \
__allocator_base=std::__new_allocator \
__exception_ptr=__unspecified__ \ __exception_ptr=__unspecified__ \
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

3
libstdc++-v3/include/bits/allocator.h
View file

@ -265,6 +265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef _Tp value_type; typedef _Tp value_type;
template<typename _Up> allocator(const allocator<_Up>&) { } template<typename _Up> allocator(const allocator<_Up>&) { }
}; };
/// @endcond
/// @} group allocator /// @} group allocator
@ -278,6 +279,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Undefine. // Undefine.
#undef __allocator_base #undef __allocator_base
/// @cond undocumented
// To implement Option 3 of DR 431. // To implement Option 3 of DR 431.
template<typename _Alloc, bool = __is_empty(_Alloc)> template<typename _Alloc, bool = __is_empty(_Alloc)>
struct __alloc_swap struct __alloc_swap