commit 9b72f89f0fade44dc431fdb9557523439f98ae11
author John McCall <rjmccall@apple.com> Wed Nov 10 02:40:36 2010 +0000
committer John McCall <rjmccall@apple.com> Wed Nov 10 02:40:36 2010 +0000
tree c1c0760cdd280859cddd41d2bdf96d508fc9104c
parent a4ceea8cd86c4fc649c7c79499ae9dddb9ea20e0

Diagnose attempst to template using declarations and using directives.
Recover from the latter and fail early for the former.  Fixes PR8022.

llvm-svn: 118669

clang/lib/Parse/ParseDecl.cpp

diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index 7e01bac..2ba4764 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -354,7 +354,8 @@
     SingleDecl = ParseNamespace(Context, DeclEnd);
     break;
   case tok::kw_using:
-    SingleDecl = ParseUsingDirectiveOrDeclaration(Context, DeclEnd, Attr);
+    SingleDecl = ParseUsingDirectiveOrDeclaration(Context, ParsedTemplateInfo(),
+                                                  DeclEnd, Attr);
     break;
   case tok::kw_static_assert:
     if (Attr.HasAttr)