Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeDist.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeDist.h
index 54b16a4cac361f0584ae5118eeb628704d60bd03..60ecabf496578942e219436b5f1ec867e1f2e3cd 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeDist.h
@@ -186,8 +186,8 @@ typedef ValueListType::const_iterator ValueListIterator;
 /// associated with that value. Assumes distributions elements are
 /// instances of NaClBitcodeDistElement.
 class NaClBitcodeDist {
-  NaClBitcodeDist(const NaClBitcodeDist&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeDist&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeDist(const NaClBitcodeDist&) = delete;
+  void operator=(const NaClBitcodeDist&) = delete;
   friend class NaClBitcodeDistElement;
 
 public:
@@ -358,9 +358,9 @@ private:
 /// of the corresponding distribution values is recorded.
 class NaClBitcodeDistElement {
   NaClBitcodeDistElement(const NaClBitcodeDistElement &)
-      LLVM_DELETED_FUNCTION;
+      = delete;
   void operator=(const NaClBitcodeDistElement &)
-      LLVM_DELETED_FUNCTION;
+      = delete;

[jvoung (off chromium), 2015/05/26 20:39:45]

nit: might be able to fit the = delete on the same line now

[Derek Schuff, 2015/05/26 22:01:32]

Done.

 
 public:
   /// Define kinds for isa, dyn_cast, etc. support. Only defined