aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-06-12 14:38:18 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-06-12 14:38:18 +0000
commit5c3decfd177102539ce87838154f30d01e30a41b (patch)
tree4f81b848cf22da1ae526c8d57c2ec83df5c5cfac /gcc
parentfafb938754336f69a0e7f3dac96c938e2a97adc9 (diff)
downloadgcc-5c3decfd177102539ce87838154f30d01e30a41b.zip
gcc-5c3decfd177102539ce87838154f30d01e30a41b.tar.gz
gcc-5c3decfd177102539ce87838154f30d01e30a41b.tar.bz2
parser.c (cp_parser_nested_name_specifier_opt): Fix typo in comment.
2013-06-12 Paolo Carlini <paolo.carlini@oracle.com> * parser.c (cp_parser_nested_name_specifier_opt): Fix typo in comment. From-SVN: r200017
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/parser.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c8a9e12..2c93982 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
2013-06-12 Paolo Carlini <paolo.carlini@oracle.com>
+ * parser.c (cp_parser_nested_name_specifier_opt): Fix typo in comment.
+
+2013-06-12 Paolo Carlini <paolo.carlini@oracle.com>
+
PR c++/42021
* parser.c (cp_parser_nested_name_specifier_opt): Avoid emitting
again diagnostic already emitted by cp_parser_lookup_name.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 7b4c358..a581e88 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -5231,7 +5231,7 @@ cp_parser_nested_name_specifier_opt (cp_parser *parser,
else if (ambiguous_decls)
{
// cp_parser_lookup_name has the same diagnostic,
- // thus make sure to emit it almost once.
+ // thus make sure to emit it at most once.
if (cp_parser_uncommitted_to_tentative_parse_p
(parser))
{