1 files changed, 0 insertions, 54 deletions

diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp
index 8cd47bfe444..baa49f521e5 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Mcast.cpp
@@ -462,22 +462,6 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
 
 }
 
-// Subscribe and add address/iface to subscription list if successful.
-int
-ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
-                                 int reuse_addr,
-                                 const ACE_TCHAR *net_if,
-                                 int protocol_family,
-                                 int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
-
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (protocol);
-
-  return this->join (mcast_addr,reuse_addr, net_if);
-}
-
 int
 ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr,
                             int reuse_addr,
@@ -810,24 +794,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
 }
 
 
-// Unsubscribe, and remove address from subscription list.
-// Note: If there are duplicate entries, only finds the first in the list (this
-// is a defined restriction - most environments don't allow duplicates to be
-// created.)
-int
-ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr,
-                                   const ACE_TCHAR *net_if,
-                                   int protocol_family,
-                                   int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe");
-
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (protocol);
-
-  return this->leave (mcast_addr, net_if);
-}
-
 int
 ACE_SOCK_Dgram_Mcast::leave (const ACE_INET_Addr &mcast_addr,
                              const ACE_TCHAR *net_if)
@@ -940,26 +906,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
 }
 
 int
-ACE_SOCK_Dgram_Mcast::unsubscribe (void)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe");
-
-  // Can't implement this reliably without keeping an expensive list,
-  // and can't close the socket since the caller may want to continue
-  // using the socket to send() or join() new groups.  Even if we
-  // wanted to be clever and reopen the socket, we'd need to know what
-  // options had been set, and reset them--and we have no way of doing
-  // that either. :-(
-  // Should this return -1?
-  ACE_ERROR_RETURN ((LM_INFO,
-                     ACE_TEXT ("ACE_SOCK_Dgram_Mcast::unsubscribe (void) ")
-                     ACE_TEXT ("has been deprecated. You must either ")
-                     ACE_TEXT ("close to socket to unsubscribe to all ")
-                     ACE_TEXT ("or unsubscribe to each individually.\n")),
-                     0);
-}
-
-int
 ACE_SOCK_Dgram_Mcast::clear_subs_list (void)
 {
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::clear_subs_list");