diff options
| author | Abramo Bagnara <abramo.bagnara@gmail.com> | 2010-06-04 09:35:39 +0000 |
|---|---|---|
| committer | Abramo Bagnara <abramo.bagnara@gmail.com> | 2010-06-04 09:35:39 +0000 |
| commit | 52d6350dd202a521050164afb75ceadccbe9a084 (patch) | |
| tree | 55047539c6f5d2c17f929f314c346863bda5a295 | |
| parent | 2e87ca218f5d11b72a00e820cfd43a472247fe68 (diff) | |
| download | bcm5719-llvm-52d6350dd202a521050164afb75ceadccbe9a084.tar.gz bcm5719-llvm-52d6350dd202a521050164afb75ceadccbe9a084.zip | |
Don't insert in lexical context implicit definitions of static member instances.
llvm-svn: 105465
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 7981c3c949a..939f6caa96a 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -373,7 +373,8 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) { SemaRef.CheckVariableDeclaration(Var, Previous, Redeclaration); if (D->isOutOfLine()) { - D->getLexicalDeclContext()->addDecl(Var); + if (!D->isStaticDataMember()) + D->getLexicalDeclContext()->addDecl(Var); Owner->makeDeclVisibleInContext(Var); } else { Owner->addDecl(Var); |
