1 files changed, 22 insertions, 34 deletions

diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index 593bd7bb431..0e1f399f49a 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -5,7 +5,7 @@
 
 #include "tao/UIOP_Transport.h"
 #include "tao/GIOP.h"
-#include "tao/Connect.h"
+#include "tao/UIOP_Connect.h"
 #include "tao/Timeprobe.h"
 
 #if defined (ACE_ENABLE_TIMEPROBES)
@@ -43,8 +43,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Transport_Timeprobe_Description,
 
 
 TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Handler_Base* handler)
-  : handler_(handler),
-    tag_(TAO_IOP_TAG_INTERNET_IOP)
+  : TAO_Transport (TAO_IOP_TAG_UNIX_IOP),
+    handler_ (handler)
 {
 }
 
@@ -52,15 +52,15 @@ TAO_UIOP_Transport::~TAO_UIOP_Transport (void)
 {
 }
 
-TAO_UIOP_Server_Transport::TAO_UIOP_Server_Transport (TAO_Server_Connection_Handler *handler)
-  : TAO_UIOP_Transport(handler),
+TAO_UIOP_Server_Transport::TAO_UIOP_Server_Transport (TAO_UIOP_Server_Connection_Handler *handler)
+  : TAO_UIOP_Transport (handler),
     server_handler_ (0)
 {
   server_handler_ = handler;
 }
 
-TAO_UIOP_Client_Transport::TAO_UIOP_Client_Transport (TAO_Client_Connection_Handler *handler)
-  :  TAO_UIOP_Transport(handler),
+TAO_UIOP_Client_Transport::TAO_UIOP_Client_Transport (TAO_UIOP_Client_Connection_Handler *handler)
+  :  TAO_UIOP_Transport (handler),
      client_handler_ (0)
 {
   client_handler_ = handler;
@@ -74,19 +74,13 @@ TAO_UIOP_Client_Transport::~TAO_UIOP_Client_Transport (void)
 {
 }
 
-CORBA::ULong
-TAO_UIOP_Transport::tag (void)
-{
-  return this->tag_;
-}
-
-TAO_Client_Connection_Handler *
+TAO_UIOP_Client_Connection_Handler *
 TAO_UIOP_Client_Transport::client_handler (void)
 {
   return this->client_handler_;
 }
 
-TAO_Server_Connection_Handler *
+TAO_UIOP_Server_Connection_Handler *
 TAO_UIOP_Server_Transport::server_handler (void)
 {
   return this->server_handler_;
@@ -139,7 +133,7 @@ TAO_UIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
                                          TAO_OutputCDR &stream,
                                          int twoway)
 {
-  ACE_FUNCTION_TIMEPROBE (TAO_UIOP_CLIENT_TRANSPORT_SEND_REQUEST_START);
+  // ACE_FUNCTION_TIMEPROBE (TAO_UIOP_CLIENT_TRANSPORT_SEND_REQUEST_START);
 
   return this->client_handler_->send_request (orb_core, stream, twoway);
 }
@@ -152,11 +146,10 @@ TAO_UIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
 // }
 
 ssize_t
-TAO_UIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *s)
+TAO_UIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
 
-  ACE_UNUSED_ARG (s);
 
   // For the most part this was copied from GIOP::send_request and
   // friends.
@@ -213,22 +206,20 @@ TAO_UIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *s)
 ssize_t
 TAO_UIOP_Transport::send (const u_char *buf,
                           size_t len,
-                          ACE_Time_Value *s)
+                          ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
 
-  ACE_UNUSED_ARG (s);
   return this->handler_->peer ().send_n (buf, len);
 }
 
 ssize_t
 TAO_UIOP_Transport::send (const iovec *iov,
                           int iovcnt,
-                          ACE_Time_Value *s)
+                          ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
 
-  ACE_UNUSED_ARG (s);
   return this->handler_->peer ().sendv_n ((const iovec *) iov,
                                           iovcnt);
 }
@@ -236,11 +227,10 @@ TAO_UIOP_Transport::send (const iovec *iov,
 ssize_t
 TAO_UIOP_Transport::recv (char *buf,
                           size_t len,
-                          ACE_Time_Value *s)
+                          ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
 
-  ACE_UNUSED_ARG (s);
   return this->handler_->peer ().recv_n (buf, len);
 }
 
@@ -248,11 +238,10 @@ ssize_t
 TAO_UIOP_Transport::recv (char *buf,
                           size_t len,
                           int flags,
-                          ACE_Time_Value *s)
+                          ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
 
-  ACE_UNUSED_ARG (s);
   return this->handler_->peer ().recv_n (buf,
                                          len,
                                          flags);
@@ -261,11 +250,10 @@ TAO_UIOP_Transport::recv (char *buf,
 ssize_t
 TAO_UIOP_Transport::recv (iovec *iov,
                           int iovcnt,
-                          ACE_Time_Value *s)
+                          ACE_Time_Value *)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
+  //  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
 
-  ACE_UNUSED_ARG (s);
   return handler_->peer ().recvv_n (iov, iovcnt);
 }