X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fstream.h;h=081c2bf04ef26685677d58af17a448f95071025d;hb=ecb8ed2090d2bc35c4ffe5febe1ba465d3e0be5d;hp=9917b94df253ed0ae103e834bf0e0ae26e7f3040;hpb=bce9a74e8addd1085b2e751508bf9ab0c2e84e45;p=m6w6%2Flibmemcached

diff --git a/libtest/stream.h b/libtest/stream.h
index 9917b94d..081c2bf0 100644
--- a/libtest/stream.h
+++ b/libtest/stream.h
@@ -130,7 +130,7 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
       _func(func)
     { }
 
-    ~log()
+    virtual ~log()
     {
       output_policy()(arg, _out, _filename, _line_number, _func);
     }
@@ -145,27 +145,66 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
 
   private:
     typename output_policy::stream_buffer arg;
+
+  private:
+    log( const log& );
+    const log& operator=( const log& );
   };
 } // namespace detail
 
 class make_cerr : public detail::log<detail::channelln> {
 public:
-  make_cerr(const char* filename, int line_number, const char* func);
+  make_cerr(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channelln>(std::cerr, filename, line_number, func)
+  { }
+
+private:
+  make_cerr( const make_cerr& );
+  const make_cerr& operator=( const make_cerr& );
 };
 
 class cerr : public detail::log<detail::channel> {
 public:
-  cerr(const char* filename, int line_number, const char* func);
+  cerr(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channel>(std::cout, filename, line_number, func)
+  { }
+
+private:
+  cerr( const cerr& );
+  const cerr& operator=( const cerr& );
 };
 
 class clog : public detail::log<detail::channel> {
 public:
-  clog(const char* filename, int line_number, const char* func);
+  clog(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channel>(std::clog, filename, line_number, func)
+  { }
+
+private:
+  clog( const clog& );
+  const clog& operator=( const clog& );
+};
+
+class make_cout : public detail::log<detail::channelln> {
+public:
+  make_cout(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channelln>(std::cout, filename, line_number, func)
+  { }
+
+private:
+  make_cout( const make_cout& );
+  const make_cout& operator=( const make_cout& );
 };
 
 class cout : public detail::log<detail::channel> {
 public:
-  cout(const char* filename, int line_number, const char* func);
+  cout(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channel>(std::cout, filename, line_number, func)
+  { }
+
+private:
+  cout( const cout& );
+  const cout& operator=( const cout& );
 };