Make various changes suggested by Chris.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79358 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 8 insertions, 48 deletions

diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h
index 33d8a02862..6024f48f9a 100644
--- a/include/llvm/CodeGen/AsmPrinter.h
+++ b/include/llvm/CodeGen/AsmPrinter.h
@@ -17,6 +17,7 @@
 #define LLVM_CODEGEN_ASMPRINTER_H
 
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/Support/DebugLoc.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/ADT/DenseMap.h"
 
@@ -24,15 +25,22 @@ namespace llvm {
   class GCStrategy;
   class Constant;
   class ConstantArray;
+  class ConstantFP;
   class ConstantInt;
   class ConstantStruct;
   class ConstantVector;
   class GCMetadataPrinter;
+  class GlobalValue;
   class GlobalVariable;
+  class MachineBasicBlock;
+  class MachineFunction;
+  class MachineInstr;
   class MachineLoopInfo;
   class MachineLoop;
+  class MachineConstantPool;
   class MachineConstantPoolEntry;
   class MachineConstantPoolValue;
+  class MachineJumpTableInfo;
   class MachineModuleInfo;
   class MCInst;
   class MCContext;
@@ -67,11 +75,6 @@ namespace llvm {
     ///
     MachineLoopInfo *LI;
 
-    /// PrintChildLoopComment - Print comments about child loops
-    /// within the loop for this basic block, with nesting.
-    ///
-    void PrintChildLoopComment(const MachineLoop *loop) const;
-
   protected:
     /// MMI - If available, this is a pointer to the current MachineModuleInfo.
     MachineModuleInfo *MMI;
diff --git a/include/llvm/Support/IOManip.h b/include/llvm/Support/IOManip.h
deleted file mode 100644
index fa9228f576..0000000000
--- a/include/llvm/Support/IOManip.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//===----------------- IOManip.h - iostream manipulators ---------*- C++ -*===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Manipulators to do special-purpose formatting.
-//
-//===----------------------------------------------------------------------===//
-
-namespace llvm {
-  /// Indent - Insert spaces into the character output stream.  The
-  /// "level" is multiplied by the "scale" to calculate the number of
-  /// spaces to insert.  "level" can represent something like loop
-  /// nesting level, for example.
-  ///
-  class Indent {
-  public:
-    explicit Indent(int lvl, int amt = 2)
-        : level(lvl), scale(amt) {}
-
-    template<typename OStream>
-    OStream &operator()(OStream &out) const {
-      for(int i = 0; i < level*scale; ++i) {
-        out << " ";
-      }
-      return out;
-    }
-
-  private:
-    int level;
-    int scale;
-  };
-
-  template<typename OStream>
-  OStream &operator<<(OStream &out, const Indent &indent)
-  {
-    return(indent(out));
-  }
-}