Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h

 //===-- NaClBitcodeBlockDist.h -----------------------------------------===//
 //      Defines distribution maps for blocks within PNaCl bitcode.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Defines a distribution map for blocks which tracks the number of bits
 // in each block, as well as the percentage of the file each bitcode block
 // ID holds.
 
 
 #ifndef LLVM_BITCODE_NACL_NACLBITCODEBLOCKDIST_H
 #define LLVM_BITCODE_NACL_NACLBITCODEBLOCKDIST_H
 
 #include "llvm/Bitcode/NaCl/NaClBitcodeBitsDist.h"
 
 namespace llvm {
 
 class NaClBitcodeBlockDistElement : public NaClBitcodeBitsDistElement {
-  NaClBitcodeBlockDistElement(const NaClBitcodeBlockDistElement&)
-  LLVM_DELETED_FUNCTION;
+  NaClBitcodeBlockDistElement(const NaClBitcodeBlockDistElement&) = delete;
   void operator=(const NaClBitcodeBlockDistElement&);
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
     return Element->getKind() >= RDE_BlockDist &&
         Element->getKind() < RDE_BlockDistLast;
   }
 
   // Top-level constructor to create instances of this class.
   explicit NaClBitcodeBlockDistElement(
@@ skipping 19 matching lines @@
   /// Prints out statistics for the row with the given value.
   virtual void PrintRowStats(raw_ostream &Stream,
                              const NaClBitcodeDist *Distribution) const;
 
   virtual void PrintRowValue(raw_ostream &Stream,
                              NaClBitcodeDistValue Value,
                              const NaClBitcodeDist *Distribution) const;
 };
 
 class NaClBitcodeBlockDist : public NaClBitcodeDist {
-  NaClBitcodeBlockDist(const NaClBitcodeBlockDist&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeBlockDist&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeBlockDist(const NaClBitcodeBlockDist&) = delete;
+  void operator=(const NaClBitcodeBlockDist&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDist *Dist) {
     return Dist->getKind() >= RD_BlockDist &&
         Dist->getKind() < RD_BlockDistLast;
   }
 
   static NaClBitcodeBlockDistElement DefaultSentinal;
 
   explicit NaClBitcodeBlockDist(
@@ skipping 10 matching lines @@
   //
   // Note: If the name is not known, an "UnknownBlock" name is
   // generated and returned.
   static std::string GetName(unsigned BlockID);
 
 };
 
 }
 
 #endif