diff options
| author | Ollie Wild <aaw@google.com> | 2012-11-27 20:56:51 +0000 |
|---|---|---|
| committer | Ollie Wild <aaw@google.com> | 2012-11-27 20:56:51 +0000 |
| commit | 46e5fecd47c407df6b1a2c7a33d4f77a789ce772 (patch) | |
| tree | 1c58df67991e80646a96a8d997d40bf49f23e923 | |
| parent | c0c67b70b76083738b5dd34d10b3dd09a788bc92 (diff) | |
Merge r7621728 from trunk.
Fix incorrect @headername Doxygen macro invocation.
Format is @headername{hdr1,hdr2} not @headername{hdr1 or hdr2}.
2012-11-27 Ollie Wild <aaw@google.com>
* include/bits/stl_tree.h (@headername): Fix incorrect Doxygen macro
invocation.
Conflicts:
libstdc++-v3/ChangeLog
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7@193870 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog.google-4_7 | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_tree.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog.google-4_7 b/libstdc++-v3/ChangeLog.google-4_7 index 69e93380d97..2b788c6cde3 100644 --- a/libstdc++-v3/ChangeLog.google-4_7 +++ b/libstdc++-v3/ChangeLog.google-4_7 @@ -1,3 +1,11 @@ +2012-11-27 Ollie Wild <aaw@google.com> + Merge r193869 from trunk. + + Google ref b/7621728. + + * include/bits/stl_tree.h (@headername): Fix incorrect Doxygen macro + invocation. + 2012-10-11 Easwaran Raman <eraman@google.com> Merge r192382 from google/main: diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index a2ae448e169..57056633274 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -54,7 +54,7 @@ /** @file bits/stl_tree.h * This is an internal header file, included by other library headers. - * Do not attempt to use it directly. @headername{map or set} + * Do not attempt to use it directly. @headername{map,set} */ #ifndef _STL_TREE_H |