X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FAssembly%2FPrintModulePass.h;h=3c4176dfdadfa5426094071760dae2ca542dad56;hb=80a75bfae980df96f969f1c05b0c4a80ce975240;hp=1dfb75e049daba6998b807224cbb7e7a87c0afb1;hpb=9bb451e721b747e83835d50dfe5ba8485c375bcf;p=oota-llvm.git

diff --git a/include/llvm/Assembly/PrintModulePass.h b/include/llvm/Assembly/PrintModulePass.h
index 1dfb75e049d..3c4176dfdad 100644
--- a/include/llvm/Assembly/PrintModulePass.h
+++ b/include/llvm/Assembly/PrintModulePass.h
@@ -1,9 +1,16 @@
-//===- llvm/Assembly/PrintModulePass.h - Printing Pass -----------*- C++ -*--=//
+//===- llvm/Assembly/PrintModulePass.h - Printing Pass ----------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
 //
 // This file defines two passes to print out a module.  The PrintModulePass pass
 // simply prints out the entire module when it is executed.  The
 // PrintFunctionPass class is designed to be pipelined with other
-// FunctionPass's, and prints out the functions of the class as they are
+// FunctionPass's, and prints out the functions of the module as they are
 // processed.
 //
 //===----------------------------------------------------------------------===//
@@ -13,22 +20,26 @@
 
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
+#include "llvm/Support/Streams.h"
+
+namespace llvm {
 
-class PrintModulePass : public Pass {
-  std::ostream *Out;      // ostream to print on
+class PrintModulePass : public ModulePass {
+  OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  PrintModulePass() : Out(&std::cerr), DeleteStream(false) {}
-  PrintModulePass(std::ostream *o, bool DS = false)
-    : Out(o), DeleteStream(DS) {
-  }
+  static char ID;
+  PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&cerr), 
+                      DeleteStream(false) {}
+  PrintModulePass(OStream *o, bool DS = false)
+    : ModulePass(intptr_t(&ID)), Out(o), DeleteStream(DS) {}
 
   ~PrintModulePass() {
     if (DeleteStream) delete Out;
   }
-  
-  bool run(Module &M) {
-    (*Out) << M;
+
+  bool runOnModule(Module &M) {
+    (*Out) << M << std::flush;
     return false;
   }
 
@@ -39,30 +50,33 @@ public:
 
 class PrintFunctionPass : public FunctionPass {
   std::string Banner;     // String to print before each function
-  std::ostream *Out;      // ostream to print on
+  OStream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  PrintFunctionPass() : Banner(""), Out(&std::cerr), DeleteStream(false) {}
-  PrintFunctionPass(const std::string &B, std::ostream *o = &std::cout,
+  static char ID;
+  PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&cerr), 
+                        DeleteStream(false) {}
+  PrintFunctionPass(const std::string &B, OStream *o = &cout,
                     bool DS = false)
-    : Banner(B), Out(o), DeleteStream(DS) {
-  }
+    : FunctionPass(intptr_t(&ID)), Banner(B), Out(o), DeleteStream(DS) {}
 
   inline ~PrintFunctionPass() {
     if (DeleteStream) delete Out;
   }
-  
+
   // runOnFunction - This pass just prints a banner followed by the function as
   // it's processed.
   //
   bool runOnFunction(Function &F) {
-    (*Out) << Banner << (Value&)F;
+    (*Out) << Banner << static_cast<Value&>(F);
     return false;
   }
-  
+
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
   }
 };
 
+} // End llvm namespace
+
 #endif