Cleanup from yesterday...make isTentativeDefinition() a static helper function (no...

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 3254d238b604f795292ff994f9e36372734d1b31..99e40776f832b1c1c0c2175dcb4582aec0daebb9 100644 (file)
--- 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 df4add2ea3e0ab50ee9d19fccc75abb0cc005f5d..580c949ddd1f857b8d1b3b9d001a984a044827ba 100644 (file)
--- 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 ||