Patches to make the LLVM sources more -pedantic clean. Patch provided

[oota-llvm.git] / include / llvm / Assembly / PrintModulePass.h

diff --git a/include/llvm/Assembly/PrintModulePass.h b/include/llvm/Assembly/PrintModulePass.h
index 7daea4c57919d6fad7458d3ee5dbfa0cbf6745be..fab59cbc1885a1f477c9401d2caa6865e8850ede 100644 (file)
--- a/include/llvm/Assembly/PrintModulePass.h
+++ b/include/llvm/Assembly/PrintModulePass.h
@@ -1,4 +1,11 @@
-//===- 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
@@ -12,25 +19,26 @@
 #define LLVM_ASSEMBLY_PRINTMODULEPASS_H
 
 #include "llvm/Pass.h"
-#include "llvm/Value.h"
+#include "llvm/Module.h"
 #include <iostream>
 
-class PrintModulePass : public Pass {
+namespace llvm {
+
+class PrintModulePass : public ModulePass {
   std::ostream *Out;      // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  inline PrintModulePass(std::ostream *o = &std::cout, bool DS = false)
+  PrintModulePass() : Out(&std::cerr), DeleteStream(false) {}
+  PrintModulePass(std::ostream *o, bool DS = false)
     : Out(o), DeleteStream(DS) {
   }
 
-  const char *getPassName() const { return "Module Printer"; }
-  
-  inline ~PrintModulePass() {
+  ~PrintModulePass() {
     if (DeleteStream) delete Out;
   }
-  
-  bool run(Module &M) {
-    (*Out) << (Value&)M;
+
+  bool runOnModule(Module &M) {
+    (*Out) << M << std::flush;
     return false;
   }
 
@@ -44,17 +52,16 @@ class PrintFunctionPass : public FunctionPass {
   std::ostream *Out;      // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
 public:
-  inline PrintFunctionPass(const std::string &B, std::ostream *o = &std::cout,
-                           bool DS = false)
+  PrintFunctionPass() : Banner(""), Out(&std::cerr), DeleteStream(false) {}
+  PrintFunctionPass(const std::string &B, std::ostream *o = &std::cout,
+                    bool DS = false)
     : Banner(B), Out(o), DeleteStream(DS) {
   }
 
-  const char *getPassName() const { return "Function Printer"; }
-  
   inline ~PrintFunctionPass() {
     if (DeleteStream) delete Out;
   }
-  
+
   // runOnFunction - This pass just prints a banner followed by the function as
   // it's processed.
   //
@@ -62,10 +69,12 @@ public:
     (*Out) << Banner << (Value&)F;
     return false;
   }
-  
+
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
   }
 };
 
+} // End llvm namespace
+
 #endif