From: Jonathan Wakely Date: Fri, 16 Dec 2016 18:13:20 +0000 (+0000) Subject: Reuse Doxygen comments for map::erase overloads X-Git-Tag: basepoints/gcc-8~2252 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f23e3d74a172b386f2fd4a2aad7d32aa13b9ae3e;p=thirdparty%2Fgcc.git Reuse Doxygen comments for map::erase overloads * include/bits/stl_map.h (map::erase(iterator)): Add Doxygen markup to reuse documentation for erase(const_iterator) overload. * include/bits/stl_multimap.h (multimap::erase(iterator)): Likewise. From-SVN: r243758 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0cf14b550ae7..0fc7832dc948 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-12-16 Jonathan Wakely + * include/bits/stl_map.h (map::erase(iterator)): Add Doxygen markup + to reuse documentation for erase(const_iterator) overload. + * include/bits/stl_multimap.h (multimap::erase(iterator)): Likewise. + * include/bits/stl_tree.h (_Rb_tree::_M_erase_aux(const_iterator)): Add assertion for undefined argument. (_Rb_tree::_M_erase_aux(const_iterator, const_iterator)): Call diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index bbd0a97f2435..2d8b8ec38b93 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -999,6 +999,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * the element, and that if the element is itself a pointer, * the pointed-to memory is not touched in any way. Managing * the pointer is the user's responsibility. + * + * @{ */ iterator erase(const_iterator __position) @@ -1009,6 +1011,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator erase(iterator __position) { return _M_t.erase(__position); } + // @} #else /** * @brief Erases an element from a %map. diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index a5f775b468f0..418b1f551c29 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -669,6 +669,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * and that if the element is itself a pointer, the pointed-to memory is * not touched in any way. Managing the pointer is the user's * responsibility. + * + * @{ */ iterator erase(const_iterator __position) @@ -679,6 +681,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator erase(iterator __position) { return _M_t.erase(__position); } + // @} #else /** * @brief Erases an element from a %multimap.