r205946 - Fix the build with LLVM_DELETED_FUNCTION instead of '= delete'

Reid Kleckner reid at kleckner.net
Wed Apr 9 18:05:01 PDT 2014


Author: rnk
Date: Wed Apr  9 20:05:01 2014
New Revision: 205946

URL: http://llvm.org/viewvc/llvm-project?rev=205946&view=rev
Log:
Fix the build with LLVM_DELETED_FUNCTION instead of '= delete'

MSVC 2012 doesn't understand '= delete', but 2013 does.

Modified:
    cfe/trunk/include/clang/Analysis/Analyses/ThreadSafetyTIL.h

Modified: cfe/trunk/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/Analyses/ThreadSafetyTIL.h?rev=205946&r1=205945&r2=205946&view=diff
==============================================================================
--- cfe/trunk/include/clang/Analysis/Analyses/ThreadSafetyTIL.h (original)
+++ cfe/trunk/include/clang/Analysis/Analyses/ThreadSafetyTIL.h Wed Apr  9 20:05:01 2014
@@ -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.





More information about the cfe-commits mailing list