7 files changed, 17 insertions, 17 deletions
diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h
index c4273ac37d..5fcda16270 100644
--- a/include/llvm/Analysis/AliasSetTracker.h
+++ b/include/llvm/Analysis/AliasSetTracker.h
@@ -156,7 +156,7 @@ public:
   iterator end()   const { return iterator(); }
   bool empty() const { return PtrList == 0; }
 
-  void print(llvm_ostream &OS) const {
+  void print(OStream &OS) const {
     if (OS.stream()) print(*OS.stream());
   }
   void print(std::ostream &OS) const;
@@ -248,7 +248,7 @@ private:
   bool aliasesCallSite(CallSite CS, AliasAnalysis &AA) const;
 };
 
-inline llvm_ostream& operator<<(llvm_ostream &OS, const AliasSet &AS) {
+inline OStream& operator<<(OStream &OS, const AliasSet &AS) {
   AS.print(OS);
   return OS;
 }
@@ -361,7 +361,7 @@ public:
   iterator begin() { return AliasSets.begin(); }
   iterator end()   { return AliasSets.end(); }
 
-  void print(llvm_ostream &OS) const {
+  void print(OStream &OS) const {
     if (OS.stream()) print(*OS.stream());
   }
   void print(std::ostream &OS) const;
@@ -390,7 +390,7 @@ private:
   AliasSet *findAliasSetForCallSite(CallSite CS);
 };
 
-inline llvm_ostream& operator<<(llvm_ostream &OS, const AliasSetTracker &AST) {
+inline OStream& operator<<(OStream &OS, const AliasSetTracker &AST) {
   AST.print(OS);
   return OS;
 }
diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h
index f29aef3a22..1f737da53c 100644
--- a/include/llvm/Analysis/CallGraph.h
+++ b/include/llvm/Analysis/CallGraph.h
@@ -152,7 +152,7 @@ public:
   ///
   void initialize(Module &M);
 
-  void print(llvm_ostream &o, const Module *M) const {
+  void print(OStream &o, const Module *M) const {
     if (o.stream()) print(*o.stream(), M);
   }
   virtual void print(std::ostream &o, const Module *M) const;
@@ -201,7 +201,7 @@ public:
   /// dump - Print out this call graph node.
   ///
   void dump() const;
-  void print(llvm_ostream &OS) const {
+  void print(OStream &OS) const {
     if (OS.stream()) print(*OS.stream());
   }
   void print(std::ostream &OS) const;
diff --git a/include/llvm/Analysis/DataStructure/DSGraph.h b/include/llvm/Analysis/DataStructure/DSGraph.h
index 61853587d7..1063efad13 100644
--- a/include/llvm/Analysis/DataStructure/DSGraph.h
+++ b/include/llvm/Analysis/DataStructure/DSGraph.h
@@ -378,12 +378,12 @@ public:
 
   /// print - Print a dot graph to the specified ostream...
   ///
-  void print(llvm_ostream &O) const {
+  void print(OStream &O) const {
     if (O.stream()) print(*O.stream());
   }
   void print(std::ostream &O) const;
 
-  /// dump - call print(llvm_cerr), for use from the debugger...
+  /// dump - call print(cerr), for use from the debugger...
   ///
   void dump() const;
 
diff --git a/include/llvm/Analysis/DataStructure/DSNode.h b/include/llvm/Analysis/DataStructure/DSNode.h
index 5eb927b90e..abcca352a6 100644
--- a/include/llvm/Analysis/DataStructure/DSNode.h
+++ b/include/llvm/Analysis/DataStructure/DSNode.h
@@ -362,7 +362,7 @@ public:
   ///
   void forwardNode(DSNode *To, unsigned Offset);
 
-  void print(llvm_ostream &O, const DSGraph *G) const {
+  void print(OStream &O, const DSGraph *G) const {
     if (O.stream()) print(*O.stream(), G);
   }
   void print(std::ostream &O, const DSGraph *G) const;
diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h
index 2e6d2471fc..238a0f627d 100644
--- a/include/llvm/Analysis/LoopInfo.h
+++ b/include/llvm/Analysis/LoopInfo.h
@@ -217,7 +217,7 @@ public:
   /// the mapping in the LoopInfo class.
   void removeBlockFromLoop(BasicBlock *BB);
 
-  void print(llvm_ostream &O, unsigned Depth = 0) const {
+  void print(OStream &O, unsigned Depth = 0) const {
     if (O.stream()) print(*O.stream(), Depth);
   }
   void print(std::ostream &O, unsigned Depth = 0) const;
@@ -283,7 +283,7 @@ public:
   virtual bool runOnFunction(Function &F);
 
   virtual void releaseMemory();
-  void print(llvm_ostream &O, const Module* = 0) const {
+  void print(OStream &O, const Module* = 0) const {
     if (O.stream()) print(*O.stream());
   }
   void print(std::ostream &O, const Module* = 0) const;
diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h
index f1497cdeda..4eb0bb33b2 100644
--- a/include/llvm/Analysis/ScalarEvolution.h
+++ b/include/llvm/Analysis/ScalarEvolution.h
@@ -97,7 +97,7 @@ namespace llvm {
     /// print - Print out the internal representation of this scalar to the
     /// specified stream.  This should really only be used for debugging
     /// purposes.
-    void print(llvm_ostream &OS) const {
+    void print(OStream &OS) const {
       if (OS.stream()) print(*OS.stream());
     }
     virtual void print(std::ostream &OS) const = 0;
@@ -107,7 +107,7 @@ namespace llvm {
     void dump() const;
   };
 
-  inline llvm_ostream &operator<<(llvm_ostream &OS, const SCEV &S) {
+  inline OStream &operator<<(OStream &OS, const SCEV &S) {
     S.print(OS);
     return OS;
   }
@@ -128,7 +128,7 @@ namespace llvm {
     virtual bool isLoopInvariant(const Loop *L) const;
     virtual const Type *getType() const;
     virtual bool hasComputableLoopEvolution(const Loop *L) const;
-    void print(llvm_ostream &OS) const {
+    void print(OStream &OS) const {
       if (OS.stream()) print(*OS.stream());
     }
     virtual void print(std::ostream &OS) const;
@@ -242,7 +242,7 @@ namespace llvm {
     virtual bool runOnFunction(Function &F);
     virtual void releaseMemory();
     virtual void getAnalysisUsage(AnalysisUsage &AU) const;
-    void print(llvm_ostream &OS, const Module* = 0) const {
+    void print(OStream &OS, const Module* = 0) const {
       if (OS.stream()) print(*OS.stream());
     }
     virtual void print(std::ostream &OS, const Module* = 0) const;
diff --git a/include/llvm/Analysis/Trace.h b/include/llvm/Analysis/Trace.h
index ad4f37ce4d..b26101d15c 100644
--- a/include/llvm/Analysis/Trace.h
+++ b/include/llvm/Analysis/Trace.h
@@ -18,11 +18,11 @@
 #ifndef LLVM_ANALYSIS_TRACE_H
 #define LLVM_ANALYSIS_TRACE_H
 
+#include "llvm/Support/Streams.h"
 #include <vector>
 #include <cassert>
 
 namespace llvm {
-  class llvm_ostream;
   class BasicBlock;
   class Function;
   class Module;
@@ -106,7 +106,7 @@ public:
 
   /// print - Write trace to output stream.
   ///
-  void print (llvm_ostream &O) const;
+  void print (OStream &O) const;
 
   /// dump - Debugger convenience method; writes trace to standard error
   /// output stream.