2 files changed, 1 insertions, 7 deletions
diff --git a/include/llvm/Support/Debug.h b/include/llvm/Support/Debug.h
index 627d088eb0..437e57ea07 100644
--- a/include/llvm/Support/Debug.h
+++ b/include/llvm/Support/Debug.h
@@ -68,7 +68,7 @@ bool isCurrentDebugType(const char *Type);
 OStream &getErrorOutputStream(const char *DebugType);
 
 #ifdef NDEBUG
-#define DOUT cnull
+#define DOUT OStream(0)
 #else
 #define DOUT getErrorOutputStream(DEBUG_TYPE)
 #endif
diff --git a/include/llvm/Support/Streams.h b/include/llvm/Support/Streams.h
index f141c92a9f..4e1e4f3a26 100644
--- a/include/llvm/Support/Streams.h
+++ b/include/llvm/Support/Streams.h
@@ -39,11 +39,6 @@ namespace llvm {
       return *this;
     }
 
-//     inline BaseStream &operator << (std::ios &(*Func)(std::ios&)) {
-//       if (Stream) *Stream << Func;
-//       return *this;
-//     }
-      
     template <typename Ty>
     BaseStream &operator << (const Ty &Thing) {
       if (Stream) *Stream << Thing;
@@ -68,7 +63,6 @@ namespace llvm {
   typedef BaseStream<std::istream> IStream;
   typedef BaseStream<std::stringstream> StringStream;
 
-  extern OStream cnull;
   extern OStream cout;
   extern OStream cerr;
   extern IStream cin;