Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClAnalyzerBlockDist.h

 //===-- NaClAnalyzerBlockDist.h --------------------------------------------===//
 //      Defines distribution maps used to collect block and record
 //      distributions for tools pnacl-bcanalyzer.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Defines a block distribution, with nested subblock and record code
 // distributions, to be collected during analysis.
 
 #ifndef LLVM_BITCODE_NACL_NACLANALYZERBLOCKDIST_H
 #define LLVM_BITCODE_NACL_NACLANALYZERBLOCKDIST_H
 
 #include "llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h"
 #include "llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h"
 #include "llvm/Bitcode/NaCl/NaClBitcodeSubblockDist.h"
 
 namespace llvm {
 
 /// Holds block distribution, and nested subblock and record code distributions,
 /// to be collected during analysis.
 class NaClAnalyzerBlockDistElement : public NaClBitcodeBlockDistElement {
-  NaClAnalyzerBlockDistElement(const NaClAnalyzerBlockDistElement&)
-  LLVM_DELETED_FUNCTION;
-  void operator=(const NaClAnalyzerBlockDistElement&) LLVM_DELETED_FUNCTION;
+  NaClAnalyzerBlockDistElement(const NaClAnalyzerBlockDistElement&) = delete;
+  void operator=(const NaClAnalyzerBlockDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
     return Element->getKind() >= RDE_NaClAnalBlockDist &&
         Element->getKind() < RDE_NaClAnalBlockDistLast;
   }
 
   explicit NaClAnalyzerBlockDistElement(unsigned BlockID=0,
                                         bool OrderBlocksByID=false)
       : NaClBitcodeBlockDistElement(RDE_NaClAnalBlockDist),
@@ skipping 36 matching lines @@
   SmallVector<NaClBitcodeDist*, 2> NestedDists;
 
   // If true, order (top-level) blocks by block ID instead of file
   // size.
   bool OrderBlocksByID;
 };
 
 /// Holds block distribution, and nested subblock and record code distributions,
 /// to be collected during analysis.
 class NaClAnalyzerBlockDist : public NaClBitcodeBlockDist {
-  NaClAnalyzerBlockDist(const NaClAnalyzerBlockDist&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClAnalyzerBlockDist&) LLVM_DELETED_FUNCTION;
+  NaClAnalyzerBlockDist(const NaClAnalyzerBlockDist&) = delete;
+  void operator=(const NaClAnalyzerBlockDist&) = delete;
 public:
   NaClAnalyzerBlockDist(NaClAnalyzerBlockDistElement &Sentinel)
       : NaClBitcodeBlockDist(&Sentinel)
   {}
 
   virtual ~NaClAnalyzerBlockDist() {}
 
   virtual void AddRecord(const NaClBitcodeRecord &Record);
 
   virtual void AddBlock(const NaClBitcodeBlock &Block);
 };
 
 }
 #endif