aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-12-16 18:13:20 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2016-12-16 18:13:20 +0000
commitf23e3d74a172b386f2fd4a2aad7d32aa13b9ae3e (patch)
tree4e6de51a23da98370f53f1fdff8a90dea6ec466b
parent36b88526410cfbf2fcbd0150dde6c1128ff466df (diff)
downloadgcc-f23e3d74a172b386f2fd4a2aad7d32aa13b9ae3e.zip
gcc-f23e3d74a172b386f2fd4a2aad7d32aa13b9ae3e.tar.gz
gcc-f23e3d74a172b386f2fd4a2aad7d32aa13b9ae3e.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/stl_map.h3
-rw-r--r--libstdc++-v3/include/bits/stl_multimap.h3
3 files changed, 10 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0cf14b5..0fc7832 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
2016-12-16 Jonathan Wakely <jwakely@redhat.com>
+ * 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 bbd0a97..2d8b8ec 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 a5f775b..418b1f5 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.