summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-08-19 13:11:23 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-08-19 13:11:23 +0000
commita866a2be79a1d19faf21a941c99f8260814086d7 (patch)
tree0c99547bc9c4b9e85b13a0a4830c6895d5225659
parentae833371448131696a79b0b6274d7ac9959dea81 (diff)
downloadATCD-a866a2be79a1d19faf21a941c99f8260814086d7.tar.gz
*** empty log message ***
-rw-r--r--README1
-rw-r--r--TAO/ChangeLog-98c6
-rw-r--r--TAO/tao/debug.cpp6
-rw-r--r--TAO/tao/debug.h6
4 files changed, 13 insertions, 6 deletions
diff --git a/README b/README
index f1634c6f802..8a1295e7278 100644
--- a/README
+++ b/README
@@ -602,6 +602,7 @@ Peter Gorgia <Peter.Gorgia@libnet.com>
Dirk Broer <Dirk.Broer@gsfc.nasa.gov>
Joseph E. LaPrade <laprade@engw.ana.bna.boeing.com>
Marherita Vittone <vittone@fndaub.fnal.gov>
+Goran Lowkrantz <Goran.Lowkrantz@infologigruppen.se>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson and is now at ObjectSpace. Paul devised the recursive
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index e03ab219479..1d27ad83cf4 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,9 @@
+Wed Aug 19 08:07:38 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * tao/debug: Fixed a couple of uses of TAO_Export to make MSVC 6.0
+ happy. Thanks to Goran Lowkrantz
+ <Goran.Lowkrantz@infologigruppen.se> for reporting this.
+
Tue Aug 18 23:58:05 1998 Irfan Pyarali <irfan@cs.wustl.edu>
* tao/ORB_Core.h (TAO_Resource_Factory): Changed this class so
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 5cb02182e46..e7194d81062 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -23,9 +23,9 @@ ACE_RCSID(tao, debug, "$Id$")
# define funlockfile(f)
#endif /* ! ACE_HAS_PTHREADS && ! ACE_HAS_DCE_DRAFT4_THREADS */
-u_int TAO_Export TAO_debug_level = 0;
-u_int TAO_Export TAO_orbdebug = 0;
-char *TAO_Export TAO_debug_filter = "l";
+TAO_Export u_int TAO_debug_level = 0;
+TAO_Export u_int TAO_orbdebug = 0;
+TAO_Export char *TAO_debug_filter = "l";
static FILE *debug_stream = stderr;
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
index 34159ba7027..4ff91385854 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -28,13 +28,13 @@
// such as process initialization. They're treated as immutable.
// 0 to ??; higher == more
-extern u_int TAO_Export TAO_debug_level;
+extern TAO_Export u_int TAO_debug_level;
// debug messages on (1) or off (0)
-extern u_int TAO_Export TAO_orbdebug;
+extern TAO_Export u_int TAO_orbdebug;
// set by getopt
-extern char * TAO_Export TAO_debug_filter;
+extern TAO_Export char *TAO_debug_filter;
// These are just simple 0, 1, and 2 argument messages that will
// appear when debugging's enabled, regardless of category. They also