From 3263c9a3a75081bac1020be3706665f84306c90e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 20 Nov 2012 13:48:28 +0000 Subject: [PATCH] 2012-11-20 Matthias Klose * doc/doxygen/user.cfg.in (ALIASES). Escape sharp braces. * include/bits/allocator.h: Escape sharp braces in comment. * include/profile/impl/profiler_algos.h: Likewise. From-SVN: r193662 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/doc/doxygen/user.cfg.in | 4 ++-- libstdc++-v3/include/bits/allocator.h | 2 +- libstdc++-v3/include/profile/impl/profiler_algos.h | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3ced7cf421e..58616cdd01c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-11-20 Matthias Klose + + * doc/doxygen/user.cfg.in (ALIASES). Escape sharp braces. + * include/bits/allocator.h: Escape sharp braces in comment. + * include/profile/impl/profiler_algos.h: Likewise. + 2012-11-20 Jonathan Wakely * include/ext/array_allocator.h: Replace uses of diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index 9d2ab05c4c6..5af636bfe92 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -196,8 +196,8 @@ TAB_SIZE = 4 # You can put \n's in the value part of an alias to insert newlines. ALIASES = "doctodo=@todo\nNeeds documentation! See http://gcc.gnu.org/onlinedocs/libstdc++/manual/documentation_style.html" \ - "headername{1}=Instead, include <\1>." \ - "headername{2}=Instead, include <\1> or <\2>." + "headername{1}=Instead, include \<\1\>." \ + "headername{2}=Instead, include \<\1\> or \<\2\>." # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index 5ccb4918848..4bfabac0ced 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -150,7 +150,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator!=(const allocator<_Tp>&, const allocator<_Tp>&) { return false; } - /// Declare uses_allocator so it can be specialized in etc. + /// Declare uses_allocator so it can be specialized in \ etc. template struct uses_allocator; diff --git a/libstdc++-v3/include/profile/impl/profiler_algos.h b/libstdc++-v3/include/profile/impl/profiler_algos.h index 977afaa800c..1be8b61be8b 100644 --- a/libstdc++-v3/include/profile/impl/profiler_algos.h +++ b/libstdc++-v3/include/profile/impl/profiler_algos.h @@ -24,7 +24,7 @@ /** @file profile/impl/profiler_algos.h * @brief Algorithms used by the profile extension. * - * This file is needed to avoid including or . + * This file is needed to avoid including \ or \. * Including those files would result in recursive includes. * These implementations are oversimplified. In general, efficiency may be * sacrificed to minimize maintenance overhead.