commit 1e054213f8416a48866105216ad4a45f1e7c24de
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Jul 21 17:05:03 2009 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Jul 21 17:05:03 2009 +0000
tree 0284b6ecd9991dd37eb14bdf49fe6baf0495c9b0
parent c19f959d7fa5303f2fff5fa7a4968361cb7ef068

Consider nested-names as part of the declarator when resolving an ambiguous statement.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76583 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseTentative.cpp

diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp
index 97f6f52..8b0d400 100644
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -427,8 +427,12 @@
   // direct-declarator:
   // direct-abstract-declarator:
 
-  if (Tok.is(tok::identifier) && mayHaveIdentifier) {
+  if ((Tok.is(tok::identifier) ||
+       (Tok.is(tok::annot_cxxscope) && NextToken().is(tok::identifier))) &&
+      mayHaveIdentifier) {
     // declarator-id
+    if (Tok.is(tok::annot_cxxscope))
+      ConsumeToken();
     ConsumeToken();
   } else if (Tok.is(tok::l_paren)) {
     ConsumeParen();