ChangeLogTag: Fri Jun 24 11:08:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 5 insertions, 22 deletions

diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index 88610590725..e2a379e027e 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -40,7 +40,6 @@ namespace TAO
 }
 
 class TAO_ClientRequestInfo;
-class TAO_ClientRequestInfo_i;
 
 namespace TAO
 {
@@ -78,22 +77,22 @@ namespace TAO
     //@{
     /// This method implements one of the "starting" client side
     /// interception points.
-    void send_request (TAO_ClientRequestInfo_i * ri
+    void send_request (TAO_ClientRequestInfo * ri
                        ACE_ENV_ARG_DECL);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    void receive_reply (TAO_ClientRequestInfo_i * ri
+    void receive_reply (TAO_ClientRequestInfo * ri
                         ACE_ENV_ARG_DECL);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    void receive_exception (TAO_ClientRequestInfo_i * ri
+    void receive_exception (TAO_ClientRequestInfo * ri
                             ACE_ENV_ARG_DECL);
 
     /// This method implements one of the "ending" client side
     /// interception point.
-    void receive_other (TAO_ClientRequestInfo_i * ri
+    void receive_other (TAO_ClientRequestInfo * ri
                         ACE_ENV_ARG_DECL);
     //@}
 
@@ -102,7 +101,7 @@ namespace TAO
     /// Process the given PortableInterceptor::ForwardRequest exception,
     /// i.e. invoke the receive_other() interception point, in addition
     /// to notifying the Invocation object of the LOCATION_FORWARD.
-    void process_forward_request (TAO_ClientRequestInfo_i * ri,
+    void process_forward_request (TAO_ClientRequestInfo * ri,
                                   PortableInterceptor::ForwardRequest & exc
                                   ACE_ENV_ARG_DECL);
 
@@ -114,25 +113,9 @@ namespace TAO
     /// Pointer to the GIOP invocation object for the current request.
     Invocation_Base * invocation_;
 
-    /// Cache the length of the interceptor list so that we don't have
-    /// to compute it at each stage of the current interception.
-    const size_t len_;
-
     /// The number of interceptors "pushed" onto the logical flow
     /// stack.  This is used when unwinding the flow stack.
     size_t stack_size_;
-
-    /// Pointer to the PortableInterceptor::ClientRequestInfo
-    /// implementation.
-    /**
-     * @note The fact that a pointer to the
-     *       PortableInterceptor::ClientRequestInfo object in TSS is
-     *       cached here assumes that all client side interception
-     *       points are invoked in the same thread.  This may not be the
-     *       case for AMI!  In that case, we'll have to perform a TSS
-     *       access in each interception point.
-     */
-    TAO_ClientRequestInfo * info_;
   };
 
 }