Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Writer/NaClValueEnumerator.h

 //===-- Bitcode/NaCl/Writer/NaClValueEnumerator.h - ----------*- C++ -*-===//
 //      Number values.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ skipping 66 matching lines @@
   SmallSet<unsigned, 32> FnForwardTypeRefs;
 
   // The index of the first global variable ID in the bitcode file.
   unsigned FirstGlobalVarID;
   // The number of global variable IDs defined in the bitcode file.
   unsigned NumGlobalVarIDs;
 
   /// \brief Integer type use for PNaCl conversion of pointers.
   Type *IntPtrType;
 
-  NaClValueEnumerator(const NaClValueEnumerator &) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClValueEnumerator &) LLVM_DELETED_FUNCTION;
+  NaClValueEnumerator(const NaClValueEnumerator &) = delete;
+  void operator=(const NaClValueEnumerator &) = delete;
 public:
   NaClValueEnumerator(const Module *M);
 
   void dump() const;
   void print(raw_ostream &OS, const ValueMapType &Map, const char *Name) const;
 
   unsigned getFirstGlobalVarID() const {
     return FirstGlobalVarID;
   }
 
@@ skipping 61 matching lines @@
   void EnumerateValue(const Value *V);
   void EnumerateType(Type *T, bool InsideOptimizeTypes=false);
   void EnumerateOperandType(const Value *V);
 
   void EnumerateValueSymbolTable(const ValueSymbolTable &ST);
 };
 
 } // End llvm namespace
 
 #endif