commit d8dd97c0a278ad685efaabc52f14acf4fd1bae6e
author Larisse Voufo <lvoufo@google.com> Wed Aug 14 03:09:19 2013 +0000
committer Larisse Voufo <lvoufo@google.com> Wed Aug 14 03:09:19 2013 +0000
tree 6750d927046c898752fdef510798ea8ca92a0d42
parent db2162903e02073e62a6265404977024fe16dfa1

Bug fix: disallow a variable template to be redeclared as a non-templated variable

llvm-svn: 188350

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index c7242aa..3379ebc 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -3365,7 +3365,7 @@
              OldVar->hasLinkage())
     LookupQualifiedName(Previous, NewVar->getDeclContext(), false);
 
-  CheckVariableDeclaration(NewVar, Previous);
+  CheckVariableDeclaration(NewVar, Previous, ForVarTemplate);
 
   if (OldVar->isOutOfLine()) {
     OldVar->getLexicalDeclContext()->addDecl(NewVar);