Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeValueDist.h

 //===-- NaClBitcodeValueDist.h ---------------------------------------------===//
 //      Defines distribution maps to separate out values at each index
 //      in a bitcode record.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
@@ skipping 27 matching lines @@
 
 /// Converts a bitcode record value to the corresponding range index that
 /// contains the value.
 NaClValueRangeIndexType GetNaClValueRangeIndex(NaClBitcodeDistValue Value);
 
 /// Converts a range index into the corresponding range of values.
 NaClValueRangeType GetNaClValueRange(NaClValueRangeIndexType RangeIndex);
 
 /// Defines the distribution of range indices.
 class NaClBitcodeValueDistElement : public NaClBitcodeDistElement {
-  NaClBitcodeValueDistElement(const NaClBitcodeValueDistElement&)
-  LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeValueDistElement&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeValueDistElement(const NaClBitcodeValueDistElement&) = delete;
+  void operator=(const NaClBitcodeValueDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
     return Element->getKind() >= RDE_ValueDist &&
         Element->getKind() < RDE_ValueDistLast;
   }
 
   NaClBitcodeValueDistElement()
       : NaClBitcodeDistElement(RDE_ValueDist)
   {}
@@ skipping 14 matching lines @@
   virtual const char *GetValueHeader() const;
 
   virtual void PrintRowValue(raw_ostream &Stream,
                              NaClBitcodeDistValue Value,
                              const NaClBitcodeDist *Distribution) const;
 };
 
 /// Defines the distribution of values for a set of value indices for
 /// bitcode records.
 class NaClBitcodeValueDist : public NaClBitcodeDist {
-  NaClBitcodeValueDist(const NaClBitcodeValueDist&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeValueDist&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeValueDist(const NaClBitcodeValueDist&) = delete;
+  void operator=(const NaClBitcodeValueDist&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDist *Dist) {
     return Dist->getKind() >= RD_ValueDist &&
         Dist->getKind() < RD_ValueDistLast;
   }
 
   /// Builds a value distribution for the given set of value indices.
   /// If AllRemainingIndices is false, only value Index is considered.
   /// Otherwise, builds a value distribution for all values stored in
@@ skipping 21 matching lines @@
   // If true, then tracks all indices >= Index. Otherwise only Index.
   bool AllRemainingIndices;
 };
 
 /// Defines the value distribution for each value index in corresponding
 /// bitcode records. This is a helper class used to separate each element
 /// in the bitcode record, so that we can determine the proper abbreviation
 /// for each element.
 class NaClBitcodeValueIndexDistElement : public NaClBitcodeDistElement {
   NaClBitcodeValueIndexDistElement(
-      const NaClBitcodeValueIndexDistElement&) LLVM_DELETED_FUNCTION;
+      const NaClBitcodeValueIndexDistElement&) = delete;
   void operator=(
-      const NaClBitcodeValueIndexDistElement&) LLVM_DELETED_FUNCTION;
+      const NaClBitcodeValueIndexDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
     return Element->getKind() <= RDE_ValueIndexDist &&
         Element->getKind() < RDE_ValueIndexDistLast;
   }
 
   explicit NaClBitcodeValueIndexDistElement(unsigned Index=0)
       : NaClBitcodeDistElement(RDE_ValueIndexDist),
         ValueDist(Index) {
@@ skipping 33 matching lines @@
   // Nested blocks used by GetNestedDistributions.
   SmallVector<NaClBitcodeDist*, 1> NestedDists;
 
   // The value distribution associated with the given index.
   NaClBitcodeValueDist ValueDist;
 };
 
 }
 
 #endif