ChangeLogTag: Thu Sep 30 16:53:48 2004 Irfan Pyarali <irfan@oomworks.com>

4 files changed, 11 insertions, 29 deletions

diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 0b0d962a9b0..0cbda1e49ed 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -72,11 +72,11 @@ TAO_SHMIOP_Connection_Handler::open (void*)
   TAO_SHMIOP_Protocol_Properties protocol_properties;
 
   // Initialize values from ORB params.
-  protocol_properties.send_buffer_size_ = 
+  protocol_properties.send_buffer_size_ =
     this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  protocol_properties.recv_buffer_size_ = 
+  protocol_properties.recv_buffer_size_ =
     this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  protocol_properties.no_delay_ = 
+  protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
 
   TAO_Protocols_Hooks *tph =
@@ -86,9 +86,9 @@ TAO_SHMIOP_Connection_Handler::open (void*)
   int client = 0;
 
   if (client)
-    tph->client_protocol_properties_at_orb_level (protocol_properties);  
+    tph->client_protocol_properties_at_orb_level (protocol_properties);
   else
-    tph->server_protocol_properties_at_orb_level (protocol_properties);  
+    tph->server_protocol_properties_at_orb_level (protocol_properties);
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
@@ -233,12 +233,6 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
                                      this->transport ());
 }
 
-int 
-TAO_SHMIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
-{
-  return 0;
-}
-
 // ****************************************************************
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index 0439090b123..08b6c387626 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -50,7 +50,7 @@ public:
   /// Constructor.
   TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
-  /// Constructor. 
+  /// Constructor.
   TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core,
                                  CORBA::Boolean flag);
 
@@ -87,9 +87,6 @@ public:
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
 
-  /// No-op since this is a local protocol.
-  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
-
 protected:
 
   //@{
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 4ffefd60d7a..005d68aa17e 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -74,9 +74,9 @@ TAO_UIOP_Connection_Handler::open (void*)
   TAO_UIOP_Protocol_Properties protocol_properties;
 
   // Initialize values from ORB params.
-  protocol_properties.send_buffer_size_ = 
+  protocol_properties.send_buffer_size_ =
     this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  protocol_properties.recv_buffer_size_ = 
+  protocol_properties.recv_buffer_size_ =
     this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
 
   TAO_Protocols_Hooks *tph =
@@ -86,9 +86,9 @@ TAO_UIOP_Connection_Handler::open (void*)
   int client = 0;
 
   if (client)
-    tph->client_protocol_properties_at_orb_level (protocol_properties);  
+    tph->client_protocol_properties_at_orb_level (protocol_properties);
   else
-    tph->server_protocol_properties_at_orb_level (protocol_properties);  
+    tph->server_protocol_properties_at_orb_level (protocol_properties);
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
@@ -211,12 +211,6 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
                                      this->transport ());
 }
 
-int 
-TAO_UIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
-{
-  return 0;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>;
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index 09598d6db1d..021a13ca345 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -55,7 +55,7 @@ public:
 
   TAO_UIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
-  /// Constructor. 
+  /// Constructor.
   TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core,
                                CORBA::Boolean flag);
 
@@ -90,9 +90,6 @@ public:
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
 
-  /// No-op since this is a local protocol.
-  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
-
 protected:
 
   //@{