This commit was manufactured by cvs2svn to create tagpre_pluggable_av_merge

'pre_pluggable_av_merge'.

1 files changed, 5 insertions, 5 deletions

diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 3b5d24aead4..bc07c30f2a3 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -89,13 +89,10 @@ public:
   // Encodes the value into the undelying CDR stream based on the
   // TypeCode parameter.
 
-  IOP::ServiceContextList& service_info (void);
+  IOP::ServiceContextList& request_service_info (void);
   // Accessor to the request ServiceContextList.  Only valid when
   // sending a request message.
 
-  CORBA::ULong request_id (void);
-  // Return the request id of this invocation.
-
   TAO_OutputCDR &out_stream (void);
   // Return the underlying output stream.
 
@@ -162,7 +159,7 @@ protected:
   TAO_Profile *profile_;
   // This invocation is using this transport, may change...
 
-  IOP::ServiceContextList service_info_;
+  IOP::ServiceContextList request_service_info_;
   // The ServiceContextList sent to the server side.  Only valid
   // when sending a request.
 
@@ -222,6 +219,9 @@ public:
                         TAO_default_environment ());
   // No CORBA::Context support (deprecated).
 
+  const IOP::ServiceContextList& reply_service_info (void) const;
+  // Accessor to the reply ServiceContextList.
+
   TAO_InputCDR &inp_stream (void);
   // return the underlying input stream