Tue Nov 27 06:33:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 20 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 39054646e65..610389685f8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 27 06:33:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/AV/UDP.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp:
+          Don't use the deprecated ACE_SOCK_Dgram_Mcast methods
+
 Mon Nov 26 19:31:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/IOR_Multicast.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index dd2a7a90261..b909407b0ec 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -801,7 +801,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler,
 
       flow_handler = handler;
 
-      result = handler->get_mcast_socket ()->subscribe (*inet_addr);
+      result = handler->get_mcast_socket ()->join (*inet_addr);
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_UDP_MCast_connector::open failed\n"),-1);
 
@@ -840,15 +840,15 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler,
 
           local_addr->set (local_addr->get_port_number (),
                            local_addr->get_host_name ());
-	  handler->set_peer_addr (local_addr);
+          handler->set_peer_addr (local_addr);
         }
     }
   else
     {
       if (local_addr == 0)
-	ACE_NEW_RETURN (local_addr,
-			ACE_INET_Addr ("0"),
-			-1);
+        ACE_NEW_RETURN (local_addr,
+                        ACE_INET_Addr ("0"),
+                        -1);
 
       TAO_AV_UDP_Flow_Handler *handler;
       ACE_NEW_RETURN (handler,
@@ -860,7 +860,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler,
       if (ct == ACCEPTOR)
         result = handler->open (*inet_addr);
       else
-	result = handler->open (*local_addr);
+        result = handler->open (*local_addr);
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"handler::open failed\n"),-1);
 
@@ -882,7 +882,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler,
         return 0;
 
       if (ct == CONNECTOR)
-	handler->set_remote_address  (inet_addr);
+        handler->set_remote_address  (inet_addr);
 
       result = handler->get_socket ()->get_local_addr (*local_addr);
 
@@ -971,8 +971,9 @@ int
 TAO_AV_UDP_Object::send_frame (ACE_Message_Block *frame,
                                TAO_AV_frame_info * /*frame_info*/)
 {
-  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Object::send_frame\n"));
-  int result = this->transport_->send (frame);
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Object::send_frame\n"));
+  int const result = this->transport_->send (frame);
   if (result < 0)
     return result;
   return 0;
@@ -983,7 +984,7 @@ TAO_AV_UDP_Object::send_frame (const iovec *iov,
                                int iovcnt,
                                TAO_AV_frame_info * /*frame_info*/)
 {
-  int result = this->transport_->send (iov,iovcnt);
+  int const result = this->transport_->send (iov,iovcnt);
   if (result < 0)
     return result;
   return 0;
@@ -993,7 +994,7 @@ int
 TAO_AV_UDP_Object::send_frame (const char*buf,
                                size_t len)
 {
-  int result = this->transport_->send (buf, len, 0);
+  int const result = this->transport_->send (buf, len, 0);
   if (result < 0)
     return result;
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index fa40043a50f..1e101055c0f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -37,10 +37,10 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr,
                        mcast_addr),
                       -1);
 
-  if (this->dgram_.subscribe (mcast_group, 1, net_if) != 0)
+  if (this->dgram_.join (mcast_group, 1, net_if) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                       "Unable to open mcast handler: error "
-                      "subscribing to %s\n",
+                      "joining to %s\n",
                        mcast_addr),
                       -1);