diff options
author | Larisse Voufo <lvoufo@google.com> | 2013-08-14 03:09:19 +0000 |
---|---|---|
committer | Larisse Voufo <lvoufo@google.com> | 2013-08-14 03:09:19 +0000 |
commit | d8dd97c0a278ad685efaabc52f14acf4fd1bae6e (patch) | |
tree | 6750d927046c898752fdef510798ea8ca92a0d42 /clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | |
parent | db2162903e02073e62a6265404977024fe16dfa1 (diff) | |
download | bcm5719-llvm-d8dd97c0a278ad685efaabc52f14acf4fd1bae6e.tar.gz bcm5719-llvm-d8dd97c0a278ad685efaabc52f14acf4fd1bae6e.zip |
Bug fix: disallow a variable template to be redeclared as a non-templated variable
llvm-svn: 188350
Diffstat (limited to 'clang/lib/Sema/SemaTemplateInstantiateDecl.cpp')
-rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index c7242aa5f99..3379ebcd900 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -3365,7 +3365,7 @@ void Sema::BuildVariableInstantiation( OldVar->hasLinkage()) LookupQualifiedName(Previous, NewVar->getDeclContext(), false); - CheckVariableDeclaration(NewVar, Previous); + CheckVariableDeclaration(NewVar, Previous, ForVarTemplate); if (OldVar->isOutOfLine()) { OldVar->getLexicalDeclContext()->addDecl(NewVar); |