From a77f14265b2f6286743d97ab1a59ba32ac0603b3 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Sun, 17 Dec 2006 05:15:13 +0000 Subject: Added an automatic cast to "std::ostream*" etc. from OStream. We then can rework the hacks that had us passing OStream in. We pass in std::ostream* instead, check for null, and then dispatch to the correct print() method. llvm-svn: 32636 --- llvm/lib/Analysis/IPA/CallGraph.cpp | 4 ++-- llvm/lib/Analysis/Trace.cpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'llvm/lib/Analysis') diff --git a/llvm/lib/Analysis/IPA/CallGraph.cpp b/llvm/lib/Analysis/IPA/CallGraph.cpp index 6e8ca184b43..dcaeaf9d338 100644 --- a/llvm/lib/Analysis/IPA/CallGraph.cpp +++ b/llvm/lib/Analysis/IPA/CallGraph.cpp @@ -74,8 +74,8 @@ public: AU.setPreservesAll(); } - void print(OStream &o, const Module *M) const { - if (o.stream()) print(*o.stream(), M); + void print(std::ostream *o, const Module *M) const { + if (o) print(*o, M); } virtual void print(std::ostream &o, const Module *M) const { diff --git a/llvm/lib/Analysis/Trace.cpp b/llvm/lib/Analysis/Trace.cpp index a0aa955ebed..3e3b1b938b0 100644 --- a/llvm/lib/Analysis/Trace.cpp +++ b/llvm/lib/Analysis/Trace.cpp @@ -31,13 +31,12 @@ Module *Trace::getModule() const { /// print - Write trace to output stream. /// -void Trace::print(OStream &O) const { +void Trace::print(std::ostream &O) const { Function *F = getFunction (); O << "; Trace from function " << F->getName() << ", blocks:\n"; for (const_iterator i = begin(), e = end(); i != e; ++i) { O << "; "; - if (O.stream()) - WriteAsOperand(*O.stream(), *i, true, getModule()); + WriteAsOperand(O, *i, true, getModule()); O << "\n"; } O << "; Trace parent function: \n" << *F; -- cgit v1.2.3