Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClObjDumpStream.h

 //===- NaClObjDumpStream.h --------------------------------------*- C++ -*-===//
 //     Models an objdump stream (bitcode records/assembly code).
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
@@ skipping 222 matching lines @@
   /// Base class for all directives. The basic functionality is that it
   /// has a reference to the text formatter, and is applied by calling
   /// method apply. This method apply is encorporated into the
   /// stream operator<<, so that they can be used as part of the
   /// streamed output.
   ///
   /// Method apply extracts any tokens in the text stream.  Moves them
   /// into the base stream. Finally, it calls virtual method MyApply
   /// to do the actions of the directive.
   class Directive {
-    Directive(const Directive&) LLVM_DELETED_FUNCTION;
-    void operator=(const Directive&) LLVM_DELETED_FUNCTION;
+    Directive(const Directive&) = delete;
+    void operator=(const Directive&) = delete;
   public:
     /// Creates a directive for the given stream.
     explicit Directive(TextFormatter *Formatter)
         : Formatter(Formatter) {}
 
     virtual ~Directive() {}
 
     /// Returns the formatter associated with the directive.
     TextFormatter &GetFormatter() const {
       return *Formatter;
@@ skipping 497 matching lines @@
 /// automatically insert the newline for you, if you did not add
 /// it. If multiple lines are to be buffered into the assembly stream,
 /// each line must be separated with a newline character.  It is
 /// always safe to end all assembly lines with a newline character.
 ///
 /// Also note that this class takes care of formatting records to fit
 /// into a calculated record width (based on value set to
 /// RecordWidth).  On the other hand, we assume that the assembly is
 /// formatted by the caller (i.e. owner of this object).
 class ObjDumpStream {
-  ObjDumpStream(const ObjDumpStream&) LLVM_DELETED_FUNCTION;
-  void operator=(const ObjDumpStream&) LLVM_DELETED_FUNCTION;
+  ObjDumpStream(const ObjDumpStream&) = delete;
+  void operator=(const ObjDumpStream&) = delete;
 public:
   /// The default number of error messages that will be printed before
   /// execution is stopped due to too many errors.
   static unsigned DefaultMaxErrors;
 
   /// The default value for the column that separates records and
   /// assembly, when DumpRecords and DumpAssembly is true.
   static unsigned ComboObjDumpSeparatorColumn;
 
   /// The default value for line width when DumpRecords is true,
@@ skipping 184 matching lines @@
     RecordBuffer.clear();
     AssemblyBuffer.clear();
     MessageBuffer.clear();
   }
 };
 
 }
 }
 
 #endif