ChangeLogTag:Tue Feb 9 17:55:31 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

11 files changed, 40 insertions, 22 deletions

diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
index 9b607a92ea8..5e696f67189 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/Active_Object_Map.h
@@ -29,6 +29,11 @@ public:
   // Returns hash value.
 };
 
+// Defined in Stub.cpp for TAO_opaque (an alias of
+// PortableServer::ObjectId).
+extern TAO_Export int operator== (const PortableServer::ObjectId &l,
+                                  const PortableServer::ObjectId &r);
+
 class TAO_Export TAO_Active_Object_Map_Entry
 {
   // = TITLE
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index d683cacb08b..b6fb9970e3c 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -32,9 +32,8 @@
 
 #include "tao/Any.h"
 #include "tao/Typecode.h"
+#include "tao/Marshal.h"
 #include "tao/Object.h"
-// The next one is only needed for sizeof(String_var)
-#include "tao/ORB.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Any.i"
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 7d44a791f3e..4d7721a6b66 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -45,7 +45,7 @@
 #define TAO_CDR_H
 
 #include "tao/corbafwd.h"
-#include "tao/Marshal.h"
+#include "tao/Typecode.h"
 
 class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
 {
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index e03b0371888..36fb5cc0f37 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -19,7 +19,7 @@
 
 #include "ace/Service_Object.h"
 #include "ace/Strategies_T.h"
-#include "tao/corbafwd.h"
+#include "tao/Connect.h"
 
 class ACE_Lock;
 class TAO_Client_Connection_Handler;
diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h
index 1de38d0e3ef..1e466d82581 100644
--- a/TAO/tao/IIOP_ORB.h
+++ b/TAO/tao/IIOP_ORB.h
@@ -15,7 +15,9 @@
 // ============================================================================
 
 #ifndef TAO_IIOPORB_H
-#  define TAO_IIOPORB_H
+#define TAO_IIOPORB_H
+
+#include "ace/INET_Addr.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index 84ea7befb13..df999fc1965 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -22,6 +22,7 @@
 
 #include "tao/corbafwd.h"
 #include "tao/Typecode.h"
+#include "tao/ORB.h"
 
 class TAO_OutputCDR;
 class TAO_InputCDR;
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index a84185ca10d..d32d9d2709d 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -15,6 +15,7 @@
 
 #include "tao/Object.h"
 #include "tao/Typecode.h"
+#include "tao/Marshal.h"
 #include "tao/InconsistentTypeCodeC.h"
 #include "tao/NVList.h"
 #include "tao/Stub.h"
@@ -1046,6 +1047,15 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &env)
 CORBA::ORB_ptr
 CORBA::ORB_init (int &argc,
                  char *const *argv,
+                 const char * orb_name)
+{
+  return CORBA::ORB_init (argc, argv, orb_name,
+                          CORBA::default_environment ());
+}
+
+CORBA::ORB_ptr
+CORBA::ORB_init (int &argc,
+                 char *const *argv,
                  const char * /* orb_name */,
                  CORBA::Environment &env)
 {
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index ef43cf0d2ed..50bb9fd74b3 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -17,6 +17,13 @@
 
 ACE_RCSID(tao, Object, "$Id$")
 
+void
+CORBA::release (CORBA_Object_ptr obj)
+{
+  if (obj)
+    obj->_decr_refcnt ();
+}
+
 CORBA_Object::~CORBA_Object (void)
 {
   this->protocol_proxy_->_decr_refcnt ();
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index 278e9bbf59f..849345c2047 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -31,13 +31,6 @@ CORBA_Object::_duplicate (CORBA_Object_ptr obj)
   return obj;
 }
 
-ACE_INLINE void
-CORBA::release (CORBA_Object_ptr obj)
-{
-  if (obj)
-    obj->_decr_refcnt ();
-}
-
 // Null pointers represent nil objects.
 
 ACE_INLINE CORBA_Object_ptr
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index 5c1f58ea1dc..78b5888260d 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -48,16 +48,12 @@
 // Object_Key
 #include "tao/Object_KeyC.h"
 
-class TAO_POA;
-class TAO_POA_Manager;
-class TAO_Active_Object_Map;
-
-extern TAO_Export int operator== (const PortableServer::ObjectId &l,
-                                  const PortableServer::ObjectId &r);
-
 // Active Object Table
 #include "tao/Active_Object_Map.h"
 
+class TAO_POA;
+class TAO_POA_Manager;
+
 class TAO_Export TAO_Thread_Policy : public POA_PortableServer::ThreadPolicy
 {
 public:
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 3151105c66e..f4fcae7d5f3 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -503,11 +503,16 @@ TAO_SYSTEM_EXCEPTION_LIST
   static CORBA_Environment& default_environment (void);
   // Obtain the thread-specific default environment.
 
-  // @@ handle the reference to CORBA_Environment here...
+  // There could be a single version of these methods, but g++ 2.7.2
+  // gets horribly confused if we used CORBA::default_environment() at 
+  // this point.
   static ORB_ptr ORB_init (int &argc,
                            char *const *argv,
-                           const char *orb_name = 0,
-                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+                           const char *orb_name = 0);
+  static ORB_ptr ORB_init (int &argc,
+                           char *const *argv,
+                           const char *orb_name,
+                           CORBA_Environment &TAO_IN_ENV);
   // ORB initialisation
 
   // = The following two methods are TAO-specific extensions.