ChangeLogTag:Mon Feb 8 13:43:10 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

1 files changed, 21 insertions, 15 deletions

diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index 02f4e08c27c..9aeb8639923 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -21,7 +21,13 @@
 #ifndef TAO_SERVER_REQUEST_H
 #define TAO_SERVER_REQUEST_H
 
+#include "tao/corbafwd.h"
+#include "tao/Object_KeyC.h"
+#include "tao/GIOP.h"
+#include "tao/Object.h"
+
 class TAO_POA;
+class TAO_ORB_Core;
 
 class TAO_Param_Data_Skel
 {
@@ -105,13 +111,13 @@ public:
   // the standard _nil method on pseudo objects
 
   virtual void arguments (CORBA::NVList_ptr &list,
-                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Implementation uses this to provide the ORB with the operation's
   // parameter list ... on return, their values are available; the
   // list fed in has typecodes and (perhap) memory assigned.
 
   virtual void set_result (const CORBA::Any &value,
-                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Implementation uses this to provide the operation result
   // ... illegal if exception() was called or params() was not called.
   //
@@ -119,7 +125,7 @@ public:
   // sent when this returns, and reclaim memory it allocated.
 
   virtual void set_exception (const CORBA::Any &value,
-                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Implementation uses this to provide the exception value which is
   // the only result of this particular invocation.
   //
@@ -160,10 +166,10 @@ public:
                         ...) = 0;
   // marshal outgoing parameters
 
-  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // marshal outgoing parameters. Used by DSI
 
-  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Start a Reply message.
 
   virtual TAO_InputCDR &incoming (void) = 0;
@@ -185,28 +191,28 @@ public:
   IIOP_ServerRequest (TAO_InputCDR &input,
                       TAO_OutputCDR &output,
                       TAO_ORB_Core *orb_core,
-                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Constructor
   IIOP_ServerRequest (CORBA::ULong &request_id,
                       CORBA::Boolean &response_expected,
-                      TAO_opaque &object_key,
+                      TAO_ObjectKey &object_key,
                       char* operation,
                       TAO_OutputCDR &output,
                       TAO_ORB_Core *orb_core,
-                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
   virtual ~IIOP_ServerRequest (void);
   // Destructor.
 
   // = General ServerRequest operations
   void arguments (CORBA::NVList_ptr &list,
-                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
   void set_result (const CORBA::Any &value,
-                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
   void set_exception (const CORBA::Any &value,
-                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
   // = Request attributes.
 
@@ -242,11 +248,11 @@ public:
   // marshal outgoing parameters and return value. This is used by the SSI
   // i.e., by the IDL compiler generated skeletons.
 
-  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // does the marshaling of outgoing parameters and is used by the DSI based
   // scheme
 
-  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // start a Reply message
 
   virtual TAO_InputCDR &incoming (void);
@@ -260,7 +266,7 @@ public:
 
   virtual CORBA::Principal_ptr principal (void) const;
 
-  virtual const TAO_opaque &object_key (void) const;
+  virtual const TAO_ObjectKey &object_key (void) const;
 
   virtual const TAO_GIOP_ServiceContextList &service_info (void) const;
 
@@ -330,7 +336,7 @@ private:
   CORBA::ULong request_id_;
   // Unique identifier for a request
 
-  TAO_opaque object_key_;
+  TAO_ObjectKey object_key_;
   // The object key of the destination object.
 
   CORBA::Principal_ptr requesting_principal_;