Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h

 //===-- NaClBitcodeCodeDist.h ---------------------------------------------===//
 //      Defines distribution maps for various values in bitcode records.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Defines simple (non-nested) distribution maps for record codes
 // appearing in bitcode records (instances of class NaClBitcodeRecord
 // in NaClBitcodeParser.h).
 
 #ifndef LLVM_BITCODE_NACL_NACLBITCODECODEDIST_H
 #define LLVM_BITCODE_NACL_NACLBITCODECODEDIST_H
 
 #include "llvm/Bitcode/NaCl/NaClBitcodeBitsAndAbbrevsDist.h"
 
 namespace llvm {
 
 // Collects the distribution of record codes/number of bits used for a
 // particular blockID and Code ID.
 class NaClBitcodeCodeDistElement
     : public NaClBitcodeBitsAndAbbrevsDistElement {
   NaClBitcodeCodeDistElement(const NaClBitcodeCodeDistElement&)
-      LLVM_DELETED_FUNCTION;
+      = delete;
   void operator=(const NaClBitcodeCodeDistElement&)
-      LLVM_DELETED_FUNCTION;
+      = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
     return Element->getKind() >= RDE_CodeDist
         && Element->getKind() < RDE_CodeDistLast;
   }
 
   explicit NaClBitcodeCodeDistElement(
       NaClBitcodeDistElementKind Kind=RDE_CodeDist)
       : NaClBitcodeBitsAndAbbrevsDistElement(Kind)
@@ skipping 13 matching lines @@
 
   virtual void PrintRowValue(raw_ostream &Stream,
                              NaClBitcodeDistValue Value,
                              const NaClBitcodeDist *Distribution) const;
 };
 
 // Collects the distribution of record codes/number of bits used for a
 // particular blockID. Assumes distribution elements are instances of
 // NaClBitcodeCodeDistElement.
 class NaClBitcodeCodeDist : public NaClBitcodeDist {
-  NaClBitcodeCodeDist(const NaClBitcodeCodeDist&)
-      LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeCodeDist&)
-      LLVM_DELETED_FUNCTION;
+  NaClBitcodeCodeDist(const NaClBitcodeCodeDist&) = delete;
+  void operator=(const NaClBitcodeCodeDist&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDist *Dist) {
     return Dist->getKind() >= RD_CodeDist
         && Dist->getKind() < RD_CodeDistLast;
   }
 
 protected:
   NaClBitcodeCodeDist(NaClBitcodeDistElement *Sentinal,
                       unsigned BlockID,
@@ skipping 27 matching lines @@
 
 private:
   // The blockID associated with the record code distribution.
   // Used so that we can look up the print name for each record code.
   unsigned BlockID;
 };
 
 }
 
 #endif