[llvm-commits] CVS: llvm/lib/Support/Debug.cpp Streams.cpp

[Bill Wendling]

Changes in directory llvm/lib/Support:

Debug.cpp updated: 1.10 -> 1.11
Streams.cpp updated: 1.2 -> 1.3
---
Log message:

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.


---
Diffs of the changes:  (+3 -3)

 Debug.cpp   |    4 ++--
 Streams.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/Support/Debug.cpp
diff -u llvm/lib/Support/Debug.cpp:1.10 llvm/lib/Support/Debug.cpp:1.11
--- llvm/lib/Support/Debug.cpp:1.10	Wed Dec  6 19:30:31 2006
+++ llvm/lib/Support/Debug.cpp	Sat Dec 16 23:15:13 2006
@@ -68,9 +68,9 @@
 // places the std::c* I/O streams into one .cpp file and relieves the whole
 // program from having to have hundreds of static c'tor/d'tors for them.
 // 
-OStream llvm::getErrorOutputStream(const char *DebugType) {
+OStream &llvm::getErrorOutputStream(const char *DebugType) {
   if (DebugFlag && isCurrentDebugType(DebugType))
     return cerr;
   else
-    return NullStream;
+    return cnull;
 }


Index: llvm/lib/Support/Streams.cpp
diff -u llvm/lib/Support/Streams.cpp:1.2 llvm/lib/Support/Streams.cpp:1.3
--- llvm/lib/Support/Streams.cpp:1.2	Wed Dec  6 19:30:31 2006
+++ llvm/lib/Support/Streams.cpp	Sat Dec 16 23:15:13 2006
@@ -16,7 +16,7 @@
 #include <iostream>
 using namespace llvm;
 
-OStream llvm::NullStream;
+OStream llvm::cnull;
 OStream llvm::cout(std::cout);
 OStream llvm::cerr(std::cerr);
 IStream llvm::cin(std::cin);