From: Steve Naroff Date: Sun, 10 Aug 2008 15:28:06 +0000 (+0000) Subject: Cleanup from yesterday...make isTentativeDefinition() a static helper function (no... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4d46cd61673202d6c32c51a8bc0abc937bff808;p=clang Cleanup from yesterday...make isTentativeDefinition() a static helper function (no need for it to be part of the Sema API). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54613 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 3254d238b6..99e40776f8 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -290,7 +290,6 @@ private: bool &Redeclaration); VarDecl *MergeVarDecl(VarDecl *New, Decl *Old); FunctionDecl *MergeCXXFunctionDecl(FunctionDecl *New, FunctionDecl *Old); - bool isTentativeDefinition(VarDecl *VD); void CheckForFileScopedRedefinitions(Scope *S, VarDecl *VD); /// Helpers for dealing with function parameters diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index df4add2ea3..580c949ddd 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -379,7 +379,7 @@ Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD, bool &Redeclaration) { } /// Predicate for C "tentative" external object definitions (C99 6.9.2). -bool Sema::isTentativeDefinition(VarDecl *VD) { +static bool isTentativeDefinition(VarDecl *VD) { if (VD->isFileVarDecl()) return (!VD->getInit() && (VD->getStorageClass() == VarDecl::None ||