[libcw-cvs] [CVS] Module src

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

CVSROOT    : /cvsroot/libcw
Module     : src
Commit time: 2002-00-12 15:43:26 UTC

Modified files:
     libcwd/bfd.cc libcwd/include/libcw/class_debug.h

Log message:

More initialization order fiasco's.

---------------------- diff included ----------------------
Index: src/libcwd/bfd.cc
diff -u src/libcwd/bfd.cc:1.91 src/libcwd/bfd.cc:1.92
--- src/libcwd/bfd.cc:1.91	Fri Jan 11 18:54:42 2002
+++ src/libcwd/bfd.cc	Sat Jan 12 07:43:15 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/bfd.cc,v 1.91 2002/01/12 02:54:42 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/bfd.cc,v 1.92 2002/01/12 15:43:15 libcw Exp $
 //
 // Copyright (C) 2000 - 2001, by
 // 
@@ -926,6 +926,9 @@
       // cwbfd::
       bool ST_init(void)
       {
+	// This must be called before calling ST_init().
+	libcw_do.NS_init();
+
 	static bool WST_being_initialized = false;
 	// This should catch it when we call new or malloc while 'internal'.
 	if (WST_being_initialized)
Index: src/libcwd/include/libcw/class_debug.h
diff -u src/libcwd/include/libcw/class_debug.h:1.3 src/libcwd/include/libcw/class_debug.h:1.4
--- src/libcwd/include/libcw/class_debug.h:1.3	Fri Jan 11 18:54:42 2002
+++ src/libcwd/include/libcw/class_debug.h	Sat Jan 12 07:43:15 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/class_debug.h,v 1.3 2002/01/12 02:54:42 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/class_debug.h,v 1.4 2002/01/12 15:43:15 libcw Exp $
 //
 // Copyright (C) 2000 - 2001, by
 // 
@@ -40,6 +40,9 @@
 
 namespace libcw {
   namespace debug {
+#ifdef DEBUGUSEBFD
+    namespace cwbfd { bool ST_init(void); }
+#endif
 
 class channel_ct;
 class fatal_channel_ct;
@@ -215,6 +218,9 @@
   friend class channel_ct;
   friend class fatal_channel_ct;
   friend void ST_initialize_globals(void);
+#ifdef DEBUGUSEBFD
+  friend bool cwbfd::ST_init(void);
+#endif
   void NS_init(void);
     // Initialize this object, needed because debug output can be written
     // from the constructors of (other) global objects, and from the malloc()
----------------------- End of diff -----------------------