Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeParser.h

 //===- NaClBitcodeParser.h -----------------------------------*- C++ -*-===//
 //     Low-level bitcode driver to parse 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 105 matching lines @@
 
 }
 
 class NaClBitcodeRecord;
 class NaClBitcodeParser;
 class NaClBitcodeParserListener;
 
 // Defines the base class for data extracted from the input bitstream
 // (i.e blocks and records).
 class NaClBitcodeData {
-  void operator=(const NaClBitcodeData&) LLVM_DELETED_FUNCTION;
+  void operator=(const NaClBitcodeData&) = delete;
 
 public:
   /// Create data element to be read from input cursor.
   explicit NaClBitcodeData(NaClBitstreamCursor &Cursor)
       : Cursor(Cursor), StartBit(Cursor.GetCurrentBitNo())
   {}
 
   /// Create copy of the given data element.
   explicit NaClBitcodeData(const NaClBitcodeData &Data)
       : Cursor(Data.Cursor), StartBit(Data.StartBit)
@@ skipping 29 matching lines @@
   // The bitstream cursor defining location within the bitcode file.
   NaClBitstreamCursor &Cursor;
 
   // Start bit for the record.
   uint64_t StartBit;
 };
 
 /// Models the block defined by a (begin) block record, through the
 /// (end) block record.
 class NaClBitcodeBlock : public NaClBitcodeData {
-  NaClBitcodeBlock(const NaClBitcodeBlock &) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeBlock &) LLVM_DELETED_FUNCTION;
+  NaClBitcodeBlock(const NaClBitcodeBlock &) = delete;
+  void operator=(const NaClBitcodeBlock &) = delete;
 
 public:
   /// Given the found (begin) block record for block BlockID, create
   /// the corresponding data associated with that block.
   NaClBitcodeBlock(unsigned BlockID, const NaClBitcodeRecord &Record);
 
   /// Create block data for block BlockID, using the input cursor.
   NaClBitcodeBlock(unsigned BlockID, NaClBitstreamCursor &Cursor)
       : NaClBitcodeData(Cursor),
         BlockID(BlockID),
@@ skipping 174 matching lines @@
         advance(NaClBitstreamCursor::AF_DontAutoprocessAbbrevs, 0);
   }
 
   /// Reads in a record's values, if the entry defines a record (Must
   /// be called after ReadEntry).
   void ReadValues() {
     Data.Values.clear();
     Data.Code = GetCursor().readRecord(Entry.ID, Data.Values);
   }
 
-  NaClBitcodeRecord(const NaClBitcodeRecord &Rcd) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeRecord &Rcd) LLVM_DELETED_FUNCTION;
+  NaClBitcodeRecord(const NaClBitcodeRecord &Rcd) = delete;
+  void operator=(const NaClBitcodeRecord &Rcd) = delete;
 };
 
 inline raw_ostream &operator<<(raw_ostream &Strm,
                                const NaClBitcodeRecord &Record) {
   Record.Print(Strm);
   return Strm;
 }
 
 /// Defines a listener to handle abbreviations within a bitcode file.
 /// In particular, abbreviations and the BlockInfo block are made more
@@ skipping 260 matching lines @@
   }
 
   // Parses a BlockInfo block, where processing is handled through
   // a listener in the bitstream reader.
   bool ParseBlockInfoInternal();
 
   // Parses the non-BlockInfo block. Returns true if unable to parse the
   // block.
   bool ParseBlockInternal();
 
-  void operator=(const NaClBitcodeParser &Parser) LLVM_DELETED_FUNCTION;
-  NaClBitcodeParser(const NaClBitcodeParser &Parser) LLVM_DELETED_FUNCTION;
+  void operator=(const NaClBitcodeParser &Parser) = delete;
+  NaClBitcodeParser(const NaClBitcodeParser &Parser) = delete;
 
 };
 
 }  // namespace llvm
 
 #endif