From: Ted Kremenek Date: Wed, 9 Apr 2008 15:51:31 +0000 (+0000) Subject: The dtor CGObjCRuntime::~CGObjCRuntime() was implemented twice, once X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2979ec73b4f974d85f2ce84167712177a44c6f09;p=clang The dtor CGObjCRuntime::~CGObjCRuntime() was implemented twice, once in CGObjCGNU.cpp and once in CGObjCEtoile.cpp. Moved its definition to CGObjC.cpp. This resolves a build error in Xcode, and also cleans things up. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49429 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp index 7894e83c05..299698f1f3 100644 --- a/lib/CodeGen/CGObjC.cpp +++ b/lib/CodeGen/CGObjC.cpp @@ -11,6 +11,7 @@ // //===----------------------------------------------------------------------===// +#include "CGObjCRuntime.h" #include "CodeGenFunction.h" #include "CodeGenModule.h" #include "clang/AST/Expr.h" @@ -23,4 +24,4 @@ llvm::Value *CodeGenFunction::EmitObjCStringLiteral(const ObjCStringLiteral *E){ return CGM.GetAddrOfConstantCFString(S); } - +CGObjCRuntime::~CGObjCRuntime() {} diff --git a/lib/CodeGen/CGObjCEtoile.cpp b/lib/CodeGen/CGObjCEtoile.cpp index 74c98224ff..efd5fac329 100644 --- a/lib/CodeGen/CGObjCEtoile.cpp +++ b/lib/CodeGen/CGObjCEtoile.cpp @@ -17,9 +17,6 @@ #include "llvm/Support/LLVMBuilder.h" #include "llvm/ADT/SmallVector.h" - -clang::CodeGen::CGObjCRuntime::~CGObjCRuntime() {} - namespace { class CGObjCEtoile : public clang::CodeGen::CGObjCRuntime { private: diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp index 9d97d475ca..7fc3eca6ce 100644 --- a/lib/CodeGen/CGObjCGNU.cpp +++ b/lib/CodeGen/CGObjCGNU.cpp @@ -17,9 +17,6 @@ #include "llvm/Support/LLVMBuilder.h" #include "llvm/ADT/SmallVector.h" - -clang::CodeGen::CGObjCRuntime::~CGObjCRuntime() {} - namespace { class CGObjCGNU : public clang::CodeGen::CGObjCRuntime { private: