From: Reid Kleckner Date: Thu, 10 Apr 2014 01:05:01 +0000 (+0000) Subject: Fix the build with LLVM_DELETED_FUNCTION instead of '= delete' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1d76ed65064eedeece6f057c2ca04c39a751caf;p=clang Fix the build with LLVM_DELETED_FUNCTION instead of '= delete' MSVC 2012 doesn't understand '= delete', but 2013 does. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@205946 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Analysis/Analyses/ThreadSafetyTIL.h b/include/clang/Analysis/Analyses/ThreadSafetyTIL.h index 2cb85e3ec6..bc9c78169f 100644 --- a/include/clang/Analysis/Analyses/ThreadSafetyTIL.h +++ b/include/clang/Analysis/Analyses/ThreadSafetyTIL.h @@ -46,6 +46,7 @@ #include "clang/Analysis/Analyses/ThreadSafetyUtil.h" #include "clang/AST/ExprCXX.h" #include "llvm/ADT/StringRef.h" +#include "llvm/Support/Compiler.h" #include #include @@ -112,11 +113,11 @@ protected: unsigned short Flags; private: - SExpr() = delete; + SExpr() LLVM_DELETED_FUNCTION; // SExpr objects must be created in an arena and cannot be deleted. - void *operator new(size_t) = delete; - void operator delete(void *) = delete; + void *operator new(size_t) LLVM_DELETED_FUNCTION; + void operator delete(void *) LLVM_DELETED_FUNCTION; }; @@ -261,7 +262,9 @@ public: Future() : SExpr(COP_Future), Status(FS_pending), Result(nullptr), Location(nullptr) {} - virtual ~Future() = delete; +private: + virtual ~Future() LLVM_DELETED_FUNCTION; +public: // Registers the location in the AST where this future is stored. // Forcing the future will automatically update the AST.