* tao/Server_Request.*:

        * tao/IIOP_Server_Request.*:
        * tao/UIOP_Server_Request.*:

          Moved IIOP specific stuff from Server_Request.* to
          IIOP_Server_Request.*.  Created UIOP-specific UIOP_Server_Request
          files based on the IIOP ones.

        * tao/Makefile:

          Added IIOP_Server_Request files to the Makefile and updated the
          dependencies.

        * tao/UIOP_Connect.{h,i,cpp}:

          Rough implementation of UIOP connection handlers based on the IIOP
          connection handlers.  Not operational yet.

        * tao/Connect.*:

          Changed all references of TAO_SVC_HANDLER to TAO_IIOP_SVC_HANDLER.

1 files changed, 2 insertions, 66 deletions

diff --git a/TAO/tao/Server_Request.i b/TAO/tao/Server_Request.i
index 345a30bf693..808df8fd876 100644
--- a/TAO/tao/Server_Request.i
+++ b/TAO/tao/Server_Request.i
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 ACE_INLINE CORBA::Boolean
@@ -15,6 +16,7 @@ CORBA::is_nil (CORBA_ServerRequest *x)
 // ServerRequest the "slow" version (with copies for each field) and
 // IIOP_ServerRequest the "fast" version (with no copies at all). The
 // first would be use for DII and the later for SII.
+
 ACE_INLINE CORBA_ServerRequest *
 CORBA_ServerRequest::_duplicate (CORBA_ServerRequest *)
 {
@@ -31,69 +33,3 @@ CORBA_ServerRequest::_nil (void)
 {
   return 0;
 }
-
-ACE_INLINE TAO_InputCDR &
-IIOP_ServerRequest::incoming (void)
-{
-  return *this->incoming_;
-}
-
-ACE_INLINE TAO_OutputCDR &
-IIOP_ServerRequest::outgoing (void)
-{
-  return *this->outgoing_;
-}
-
-// Invocation attributes.
-
-ACE_INLINE const char *
-IIOP_ServerRequest::operation (void) const
-{
-  return this->operation_.c_str ();
-}
-
-// get the length of the operation name.
-ACE_INLINE unsigned int
-IIOP_ServerRequest::operation_length (void) const
-{
-  return this->operation_.length ();
-}
-
-#if 0
-//@@ (TAO) to do after Context is implemented
-ACE_INLINE CORBA::Context_ptr
-IIOP_ServerRequest::ctx (void)
-{
-  return 0;
-}
-#endif
-
-ACE_INLINE CORBA::Boolean
-IIOP_ServerRequest::response_expected (void) const
-{
-  return this->response_expected_;
-}
-
-ACE_INLINE CORBA::Principal_ptr
-IIOP_ServerRequest::principal (void) const
-{
-  return this->requesting_principal_;
-}
-
-ACE_INLINE const TAO_ObjectKey &
-IIOP_ServerRequest::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE const TAO_GIOP_ServiceContextList &
-IIOP_ServerRequest::service_info (void) const
-{
-  return this->service_info_;
-}
-
-ACE_INLINE CORBA::ULong
-IIOP_ServerRequest::request_id (void)
-{
-  return this->request_id_;
-}