Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h

 //===-- llvm/Bitcode/NaCl/NaClBitcodeHeader.h - ----------------*- C++ -*-===//
 //      NaCl Bitcode header reader.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ skipping 13 matching lines @@
 
 namespace llvm {
 class MemoryObject;
 
 // Class representing a variable-size metadata field in the bitcode header.
 // Also contains the list of known (typed) Tag IDs.
 //
 // The serialized format has 2 fixed subfields (ID:type and data length) and the
 // variable-length data subfield
 class NaClBitcodeHeaderField {
-  NaClBitcodeHeaderField(const NaClBitcodeHeaderField &) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeHeaderField &)LLVM_DELETED_FUNCTION;
+  NaClBitcodeHeaderField(const NaClBitcodeHeaderField &) = delete;
+  void operator=(const NaClBitcodeHeaderField &) = delete;
 
 public:
   // Defines the ID associated with the value. Valid values are in
   // {0x0, ..., 0xFFF}
   typedef enum {
     kInvalid = 0,             // KUnknownType.
     kPNaClVersion = 1,        // kUint32Type.
     kAlignBitcodeRecords = 2, // kFlagType.
     kTag_MAX = kAlignBitcodeRecords
   } Tag;
@@ skipping 98 matching lines @@
     *Value = Buf[0] | Buf[1] << 8;
   }
   Tag ID;
   FieldType FType;
   size_t Len;
   uint8_t *Data;
 };
 
 /// \brief Class holding parsed header fields in PNaCl bitcode file.
 class NaClBitcodeHeader {
-  NaClBitcodeHeader(const NaClBitcodeHeader &) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeHeader &) LLVM_DELETED_FUNCTION;
+  NaClBitcodeHeader(const NaClBitcodeHeader &) = delete;
+  void operator=(const NaClBitcodeHeader &) = delete;
 
   // The set of parsed header fields. The header takes ownership of
   // all fields in this vector.
   std::vector<NaClBitcodeHeaderField *> Fields;
   // The number of bytes in the PNaCl header.
   size_t HeaderSize;
   // String defining why it is unsupported (if unsupported).
   std::string UnsupportedMessage;
   // Flag defining if header is supported.
   bool IsSupportedFlag;
@@ skipping 88 matching lines @@
   bool UnsupportedError(StringRef Message) {
     UnsupportedMessage = Message.str();
     return true;
   }
 
 };
 
 } // namespace llvm
 
 #endif