Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeDist.h

 //===- NaClBitcodeDist.h ---------------------------------------*- C++ -*-===//
 //     Maps distributions of values in PNaCl bitcode files.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ skipping 168 matching lines @@
 /// values.
 typedef std::vector<NaClBitcodeDistValue> ValueListType;
 
 typedef ValueListType::const_iterator ValueListIterator;
 
 /// Defines a PNaCl bitcode record distribution map. The distribution
 /// map is a map from a (record) value, to the corresponding data
 /// 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:
   /// Define kinds for isa, dyn_cast, etc. support (see
   /// llvm/Support/Casting.h). Only defined for concrete classes.
   enum NaClBitcodeDistKind {
     RD_Dist,                 // class NaClBitcodeDist.
       RD_BlockDist,          // class NaClBitcodeBlockDist.
       RD_BlockDistLast,
       RD_CodeDist,           // class NaClBitcodeCodeDist.
@@ skipping 150 matching lines @@
   // The total number of instances in the map.
   unsigned Total;
 };
 
 /// Defines the element type of a PNaCl bitcode distribution map.
 /// This is the base class for all element types used in
 /// NaClBitcodeDist.  By default, only the number of instances
 /// 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
   /// for concrete classes.
   enum NaClBitcodeDistElementKind {
     RDE_Dist,                    // class NaClBitcodeDistElement.
       RDE_AbbrevDist,            // class NaClBitcodeAbbrevDistElement.
       RDE_AbbrevDistLast,
       RDE_BitsDist,              // class NaClBitcodeBitsDistElement.
         RDE_BitsAndAbbrevsDist,  // class NaClBitcodeBitsAndAbbrevsDistElement.
@@ skipping 124 matching lines @@
 GetElement(NaClBitcodeDistValue Value) {
   if (TableMap.find(Value) == TableMap.end()) {
     TableMap[Value] = CreateElement(Value);
   }
   return TableMap[Value];
 }
 
 }
 
 #endif