[libcw-cvs] [CVS] Module src

[Carlo W. <li...@us...>]

CVSROOT    : /cvsroot/libcw
Module     : src
Commit time: 2002-00-05 03:53:45 UTC

Modified files:
     libcwd/debugmalloc.cc libcwd/include/cwd_debug.h

Log message:

Always use an enumerator.

---------------------- diff included ----------------------
Index: src/libcwd/debugmalloc.cc
diff -u src/libcwd/debugmalloc.cc:1.66 src/libcwd/debugmalloc.cc:1.67
--- src/libcwd/debugmalloc.cc:1.66	Thu Jan  3 20:22:33 2002
+++ src/libcwd/debugmalloc.cc	Fri Jan  4 19:53:35 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/debugmalloc.cc,v 1.66 2002/01/04 04:22:33 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/debugmalloc.cc,v 1.67 2002/01/05 03:53:35 libcw Exp $
 //
 // Copyright (C) 2000 - 2001, by
 // 
@@ -559,7 +559,7 @@
 }
 
 #ifdef DEBUGDEBUGMALLOC
-_private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, memblk_key_ct const& data)
+_private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, memblk_key_ct const& data)
 {
   write(2, "<memblk_key_ct>", 15);
   return raw_write;
@@ -844,7 +844,7 @@
   void print_on(std::ostream& os) const;
   friend _private_::no_alloc_ostream_ct& operator<<(_private_::no_alloc_ostream_ct& os, dm_location_ct const& data);
 #ifdef DEBUGDEBUGOUTPUT
-  friend _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& os, dm_location_ct const& data);
+  friend _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& os, dm_location_ct const& data);
 #endif
 };
 #endif // DEBUGUSEBFD
@@ -872,7 +872,7 @@
 }
 
 #ifdef DEBUGDEBUGOUTPUT
-_private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, dm_location_ct const& data)
+_private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, dm_location_ct const& data)
 {
   size_t len = strlen(data.M_filename);
   if (len < 20)
Index: src/libcwd/include/cwd_debug.h
diff -u src/libcwd/include/cwd_debug.h:1.3 src/libcwd/include/cwd_debug.h:1.4
--- src/libcwd/include/cwd_debug.h:1.3	Fri Jan  4 18:35:12 2002
+++ src/libcwd/include/cwd_debug.h	Fri Jan  4 19:53:35 2002
@@ -1,5 +1,5 @@
 // Generated automatically from sys.ho.in by configure.
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/cwd_debug.h,v 1.3 2002/01/05 02:35:12 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/cwd_debug.h,v 1.4 2002/01/05 03:53:35 libcw Exp $
 //
 // Copyright (C) 2001, by
 //
@@ -128,21 +128,18 @@
 
 #ifdef DEBUGDEBUG
 namespace _private_ {
-#if defined(__FreeBSD__) && __GNUC__ < 3
-  // The other thing is not emitted apparently.
-  enum non_allocating_fake_ostream_using_write_ct { raw_write };
-#else
-  static class non_allocating_fake_ostream_using_write_ct { } const raw_write = { };
+  // Dummy type used as fake 'ostream' to write to write(2).
+  enum raw_write_nt { raw_write };
 #endif
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, char const* data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, char const* data)
 {
   write(2, data, strlen(data));
   return raw_write;
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, void const* data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, void const* data)
 {
   size_t dat = (size_t)data;
   write(2, "0x", 2);
@@ -159,7 +156,7 @@
   return raw_write;
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, bool data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, bool data)
 {
   if (data)
     write(2, "true", 4);
@@ -168,7 +165,7 @@
   return raw_write;
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, char data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, char data)
 {
   char c[1];
   c[0] = data;
@@ -176,7 +173,7 @@
   return raw_write;
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, unsigned long data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, unsigned long data)
 {
   char c[11];
   char* p = &c[11];
@@ -190,7 +187,7 @@
   return raw_write;
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, long data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, long data)
 {
   if (data < 0)
   {
@@ -200,17 +197,17 @@
   return operator<<(raw_write, (unsigned long)data);
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, int data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, int data)
 {
   return operator<<(raw_write, (long)data);
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, unsigned int data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, unsigned int data)
 {
   return operator<<(raw_write, static_cast<unsigned long>(data));
 }
 
-inline _private_::non_allocating_fake_ostream_using_write_ct const& operator<<(_private_::non_allocating_fake_ostream_using_write_ct const& raw_write, libcw::debug::_private_::internal_string const& data)
+inline _private_::raw_write_nt const& operator<<(_private_::raw_write_nt const& raw_write, libcw::debug::_private_::internal_string const& data)
 {
   write(2, data.data(), data.size());
   return raw_write;
----------------------- End of diff -----------------------