From bf8da9d7062b143f63596743232df6d05e6e8e34 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 6 Feb 2012 11:13:08 +0000 Subject: Move instantiateTemplateAttribute into the sema namespace, make helpers static. llvm-svn: 149864 --- clang/lib/Sema/SemaExpr.cpp | 2 +- clang/lib/Sema/SemaTemplateInstantiate.cpp | 8 ++++++-- clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'clang/lib/Sema') diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 2a9fd61d9c2..15dfb0b8c20 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9325,7 +9325,7 @@ ExprResult Sema::HandleExprEvaluationContextForTypeof(Expr *E) { return TranformToPotentiallyEvaluated(E); } -bool IsPotentiallyEvaluatedContext(Sema &SemaRef) { +static bool IsPotentiallyEvaluatedContext(Sema &SemaRef) { // Do not mark anything as "used" within a dependent context; wait for // an instantiation. if (SemaRef.CurContext->isDependentContext()) diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index dde782672fa..8abb6e149a5 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -1665,8 +1665,12 @@ Sema::SubstBaseSpecifiers(CXXRecordDecl *Instantiation, } // Defined via #include from SemaTemplateInstantiateDecl.cpp -Attr* instantiateTemplateAttribute(const Attr *At, ASTContext &C, Sema &S, - const MultiLevelTemplateArgumentList &TemplateArgs); +namespace clang { + namespace sema { + Attr *instantiateTemplateAttribute(const Attr *At, ASTContext &C, Sema &S, + const MultiLevelTemplateArgumentList &TemplateArgs); + } +} /// \brief Instantiate the definition of a class from a given pattern. /// diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index a957f25ef27..3cf816a332f 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -100,8 +100,8 @@ void Sema::InstantiateAttrs(const MultiLevelTemplateArgumentList &TemplateArgs, Saved = CurrentInstantiationScope->cloneScopes(OuterMostScope); LateAttrs->push_back(LateInstantiatedAttribute(TmplAttr, Saved, New)); } else { - Attr *NewAttr = - instantiateTemplateAttribute(TmplAttr, Context, *this, TemplateArgs); + Attr *NewAttr = sema::instantiateTemplateAttribute(TmplAttr, Context, + *this, TemplateArgs); New->addAttr(NewAttr); } } -- cgit v1.2.3