diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-03-08 15:51:03 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-03-08 15:51:03 +0000 |
| commit | df88f6fe98793d8305797f23e38d613bc6960028 (patch) | |
| tree | d02df95d501d6603e58b2f7e9408525c4b12b3bf /clang/lib/Sema | |
| parent | 3cbe5cfff30688f0da694462baf7263b5b9625e8 (diff) | |
| download | bcm5719-llvm-df88f6fe98793d8305797f23e38d613bc6960028.tar.gz bcm5719-llvm-df88f6fe98793d8305797f23e38d613bc6960028.zip | |
Replace MarkVarRequired with a more generic
HandleCXXStaticMemberVarInstantiation. Suggested by Argyrios.
llvm-svn: 152320
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 4633db737ac..7d2ec16cbac 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -2609,12 +2609,11 @@ void Sema::InstantiateStaticDataMemberDefinition( if (TSK == TSK_ExplicitInstantiationDeclaration) return; + Consumer.HandleCXXStaticMemberVarInstantiation(Var); + // If we already have a definition, we're done. - if (Var->getDefinition()) { - if (TSK == TSK_ExplicitInstantiationDefinition) - Consumer.MarkVarRequired(Var); + if (Var->getDefinition()) return; - } InstantiatingTemplate Inst(*this, PointOfInstantiation, Var); if (Inst) |
