diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-08-28 22:06:43 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-08-28 22:06:43 +0000 |
commit | ed656469895ab77177669abe1611dbef8d33b90f (patch) | |
tree | e70071fef38343b02f15156a1bc08e36849dd8d0 /lib/Sema/SemaTemplateInstantiateDecl.cpp | |
parent | 7fe5d72fbc8605b60d42d32394248ea76cf763a0 (diff) |
Remove #if 0'd code that is clearly not needed
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80399 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiateDecl.cpp')
-rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index 7b06bf909a..8370bd17ef 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -1069,32 +1069,8 @@ void Sema::InstantiateStaticDataMemberDefinition( DeclContext *PreviousContext = CurContext; CurContext = Var->getDeclContext(); -#if 0 - // Instantiate the initializer of this static data member. - OwningExprResult Init - = InstantiateExpr(Def->getInit(), getTemplateInstantiationArgs(Var)); - if (Init.isInvalid()) { - // If instantiation of the initializer failed, mark the declaration invalid - // and don't instantiate anything else that was triggered by this - // instantiation. - Var->setInvalidDecl(); - - // Restore the set of pending implicit instantiations. - PendingImplicitInstantiations.swap(SavedPendingImplicitInstantiations); - - return; - } - - // Type-check the initializer. - if (Init.get()) - AddInitializerToDecl(DeclPtrTy::make(Var), move(Init), - Def->hasCXXDirectInitializer()); - else - ActOnUninitializedDecl(DeclPtrTy::make(Var), false); -#else Var = cast_or_null<VarDecl>(SubstDecl(Def, Var->getDeclContext(), getTemplateInstantiationArgs(Var))); -#endif CurContext = PreviousContext; |