From c37709b3c57fc08cd94804ac50795af013a0225f Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 28 Aug 2009 22:06:43 +0000 Subject: [PATCH] Remove #if 0'd code that is clearly not needed llvm-svn: 80399 --- .../lib/Sema/SemaTemplateInstantiateDecl.cpp | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 7b06bf909aa7..8370bd17efad 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/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(SubstDecl(Def, Var->getDeclContext(), getTemplateInstantiationArgs(Var))); -#endif CurContext = PreviousContext;