diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-11-01 20:32:48 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-11-01 20:32:48 +0000 |
commit | cf3293eaeb3853d12cff47e648bbe835004e929f (patch) | |
tree | 14b48e79cfb981e7df5e1bc23622096f478f2c3d /lib/Sema | |
parent | 7a343142901f7f6bd1965051a24ae6a12c6f2148 (diff) |
When determining whether a reference to a static data member is an
integral constant expression, make sure to find where the initializer
was provided---inside or outside the class definition---since that can
affect whether we have an integral constant expression (and, we need
to see the initializer itself).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85741 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema')
-rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index 27275230f7..7288ae29a0 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -165,7 +165,7 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) { // which they were instantiated. if (Var->isStaticDataMember()) SemaRef.Context.setInstantiatedFromStaticDataMember(Var, D, - TSK_ImplicitInstantiation); + TSK_ImplicitInstantiation); if (D->getInit()) { OwningExprResult Init |