ChangeLogTag:Mon Feb 08 15:20:09 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

8 files changed, 40 insertions, 11 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 54d2db29295..1a17f442e7d 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,26 @@
+Mon Feb 08 15:20:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/corba.h: 
+	* tao/corbafwd.h: 
+	  On NT we need to define DEBUG when _DEBUG is defined, but this
+	  definition was left on corba.h by mistake, now it is in
+	  corbafwd.h
+
+	* tao/Invocation.h: 
+	  MSVC++ doesn't know that a class and a struct are the same
+	  thing, and it complains when a structure is forward declared as
+	  a class; silly
+
+	* orbsvcs/orbsvcs/Trader/Trader.cpp: 
+	  MSVC++ gets confused by typedefs inside classes again.
+
+	* tao/ORB_Strategies_T.cpp: 
+	  Added missing #include.
+
+	* tao/debug.cpp: 
+	* tao/debug.h: 
+	  Fixed some #include problems.
+
 Mon Feb  8 15:25:00 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* examples/Simple/echo/Makefile
@@ -8,6 +31,7 @@ Mon Feb  8 15:25:00 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* examples/Simple/echo/Echo_Client_i.cpp
 	* examples/Simple/echo/Echo_Client_i.h
 	New files after removing Server_i.* and Client_i.*
+
 Mon Feb  8 14:26:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* tao/DynAnyC.cpp: 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 7960d7650c5..4c51b257702 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -542,17 +542,17 @@ TAO_String_Hash_Key::TAO_String_Hash_Key (void)
 }
 
 TAO_String_Hash_Key::TAO_String_Hash_Key (char * name)
-  : CORBA::String_var (name)
+  : CORBA_String_var (name)
 {
 }
 
 TAO_String_Hash_Key::TAO_String_Hash_Key (const char * name)
-  : CORBA::String_var (name)
+  : CORBA_String_var (name)
 {
 }
 
 TAO_String_Hash_Key::TAO_String_Hash_Key (const CORBA::String_var &src)
-  : CORBA::String_var (src)
+  : CORBA_String_var (src)
 {
 }
 
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index e54a485baf7..321f7dc6754 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -31,7 +31,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/GIOP.h"
 
-class TAO_Exception_Data;
+struct TAO_Exception_Data;
 
 class TAO_Export TAO_GIOP_Invocation
 {
diff --git a/TAO/tao/ORB_Strategies_T.cpp b/TAO/tao/ORB_Strategies_T.cpp
index 460ee9a70db..170633fdeca 100644
--- a/TAO/tao/ORB_Strategies_T.cpp
+++ b/TAO/tao/ORB_Strategies_T.cpp
@@ -4,6 +4,7 @@
 #define ORB_STRATEGIES_T_C
 
 #include "tao/ORB_Strategies_T.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/ORB_Strategies_T.i"
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 21d68e5f3e2..d6a4c3ec553 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -34,12 +34,6 @@
 
 #include "tao/corbafwd.h"
 
-#if     defined (_MSC_VER)
-#       ifdef   _DEBUG                  // convert from VC++ convention ...
-#               define  DEBUG           // ... to normal convention
-#       endif
-#endif /* _MSC_VER */
-
 #include "tao/Environment.h"
 #include "tao/ORB.h"
 #include "tao/Exception.h"
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 850912f2af9..3151105c66e 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -55,6 +55,12 @@
 #  define TAO_SINGLETON_DECLARATION(T)
 #endif /* TAO_HAS_DLL */
 
+#if defined (_MSC_VER)
+# ifdef   _DEBUG                  // convert from VC++ convention ...
+#  define  DEBUG           // ... to normal convention
+# endif
+#endif /* _MSC_VER */
+
 // Forward declarations of some data types are needed.
 
 class CORBA_Any;
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 376a525779d..8777b222ba1 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -13,7 +13,9 @@
 //
 // XXX on Windows, make it always use OutputDebugString () instead of stdio. 
 
-#include "tao/corbafwd.h"
+#include "tao/debug.h"
+#include "tao/Environment.h"
+#include "tao/Exception.h"
 
 ACE_RCSID(tao, debug, "$Id$")
 
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
index b5ae4428af7..93e76e4720e 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -21,6 +21,8 @@
 #ifndef TAO_DEBUG_H
 #define TAO_DEBUG_H
 
+#include "tao/corbafwd.h"
+
 // These are global to simplify is use by other code, very much in
 // particular by getopt and related argument-parsing code
 //