ChangeLogTag:Tue Oct 28 12:02:47 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

1 files changed, 63 insertions, 18 deletions

diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 684eaef1f01..1506135d82a 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -18,22 +18,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "corbafwd.h"
+#include "Exception.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Exception.h"
-#include "ServicesC.h"
-#include "CORBA_String.h"
-#include "ObjectIdListC.h"
 #include "objectid.h"
-
-// IRIX needs this for the throw specs
 #include "PolicyC.h"
+#include "OBV_Constants.h"
+#include "CORBA_methods.h"
 
 #include "ace/Thread_Mutex.h"
+#include "ace/Guard_T.h"
 
 typedef enum
 {
@@ -55,7 +52,6 @@ class TAO_Stub;
 class TAO_Valuetype_Adapter;
 class TAO_Acceptor_Filter;
 
-
 // ****************************************************************
 
 namespace CORBA
@@ -64,17 +60,67 @@ namespace CORBA
   class StructMemberSeq;
   class UnionMemberSeq;
   class ValueMemberSeq;
-
   class ORB_ObjectIdList;
 
-  class ORB;
-  typedef TAO_Pseudo_Var_T<ORB> ORB_var;
-  typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out;
+  // Used at present only in Typecode_Constants.cpp, to make _tc_ORBid.
+  // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
+  typedef char * ORBid;
+  typedef String_var ORBid_var;
+  typedef String_out ORBid_out;
+  extern TAO_Export TypeCode_ptr _tc_ORBid;
+
+  // A couple of string typedefs used by various libs and services.
+  typedef char * Identifier;
+  typedef String_var Identifier_var;
+  typedef String_out Identifier_out;
+  typedef char * RepositoryId;
+  typedef String_var RepositoryId_var;
+  typedef String_out RepositoryId_out;
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ORB_ObjectIdList,
+        TAO_SeqElem_String_Manager
+      >
+    ORB_ObjectIdList_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ORB_ObjectIdList,
+        ORB_ObjectIdList_var,
+        TAO_SeqElem_String_Manager
+      >
+    ORB_ObjectIdList_out;
+
+  struct ServiceInformation;
+
+  typedef
+    TAO_Var_Var_T<
+        ServiceInformation
+      >
+    ServiceInformation_var;
+
+  typedef
+    TAO_Out_T<
+        ServiceInformation,
+        ServiceInformation_var
+      >
+    ServiceInformation_out;
+
+  class ValueFactoryBase;
+  typedef ValueFactoryBase *ValueFactory;
+
+  typedef UShort ServiceType;
 
   class Request;
   typedef TAO_Pseudo_Var_T<Request> Request_var;
   typedef TAO_Pseudo_Out_T<Request, Request_var> Request_out;
 
+  class ORB;
+  typedef ORB *ORB_ptr;
+  typedef TAO_Pseudo_Var_T<ORB> ORB_var;
+  typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out;
+
   /**
    * @class ORB
    *
@@ -175,8 +221,7 @@ namespace CORBA
 
     typedef
       TAO_Unbounded_Pseudo_Sequence<
-          CORBA::Request,
-          CORBA::Request_var
+          CORBA::Request
         >
       RequestSeq;
 
@@ -184,8 +229,7 @@ namespace CORBA
       TAO_VarSeq_Var_T<
           RequestSeq,
           TAO_Pseudo_Object_Manager<
-              CORBA::Request,
-              CORBA::Request_var
+              CORBA::Request
             >
         >
       RequestSeq_var;
@@ -195,8 +239,7 @@ namespace CORBA
           RequestSeq,
           RequestSeq_var,
           TAO_Pseudo_Object_Manager<
-              CORBA::Request,
-              CORBA::Request_var
+              CORBA::Request
             >
         >
       RequestSeq_out;
@@ -536,6 +579,7 @@ namespace CORBA
 
     /// Set collocation optimization status.
     /// Get collocation optimization status.
+    /// @@todo: Who is calling this?
     void _optimize_collocation_objects (CORBA::Boolean opt);
     CORBA::Boolean _optimize_collocation_objects (void) const;
 
@@ -650,4 +694,5 @@ namespace CORBA
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_ORB_H */