diff options
| author | Reid Kleckner <reid@kleckner.net> | 2014-04-10 01:05:01 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2014-04-10 01:05:01 +0000 |
| commit | eb2ecff166b04d3af73b90aaccf3ba108300b199 (patch) | |
| tree | ae533482a648accd02a0deb3ca40877a1a86ea6b | |
| parent | 61182a89e882d630f354c01a96500569e151ed28 (diff) | |
| download | bcm5719-llvm-eb2ecff166b04d3af73b90aaccf3ba108300b199.tar.gz bcm5719-llvm-eb2ecff166b04d3af73b90aaccf3ba108300b199.zip | |
Fix the build with LLVM_DELETED_FUNCTION instead of '= delete'
MSVC 2012 doesn't understand '= delete', but 2013 does.
llvm-svn: 205946
| -rw-r--r-- | clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h b/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h index 2cb85e3ec66..bc9c78169f2 100644 --- a/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h +++ b/clang/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 <cassert> #include <cstddef> @@ -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. |

