summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-12 14:38:18 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-12 14:38:18 +0000
commitb5967443486ef802f2846ffa2baa0835a1bcf063 (patch)
tree4f81b848cf22da1ae526c8d57c2ec83df5c5cfac
parent5c4ef889ce7b0ef6a507f313376de4d3a54ba03b (diff)
downloadgcc-b5967443486ef802f2846ffa2baa0835a1bcf063.tar.gz
2013-06-12 Paolo Carlini <paolo.carlini@oracle.com>
* parser.c (cp_parser_nested_name_specifier_opt): Fix typo in comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200017 138bc75d-0d04-0410-961f-82ee72b054a4
-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 c8a9e127963..2c9398288cd 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 7b4c358d533..a581e88e44b 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))
{