summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
diff options
context:
space:
mode:
authornobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-14 16:42:37 +0000
committernobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-14 16:42:37 +0000
commit25496e24b8043b7b515b3f8beb8e453fb105211c (patch)
treef1b34a170ac61e90a3eb102b879e9d51d10336bc /TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
parentfa92d4711fb7519995b6bb9e5a16016d7326bbb0 (diff)
downloadATCD-25496e24b8043b7b515b3f8beb8e453fb105211c.tar.gz
This commit was manufactured by cvs2svn to create tagoci_wchar_refactor_merge_in_4_14_06
'oci_wchar_refactor_merge_in_4_14_06'.
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 73a947638cf..83543b4416f 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -1,18 +1,15 @@
// $Id$
-#include "orbsvcs/IOR_Multicast.h"
+#include "IOR_Multicast.h"
#include "tao/debug.h"
#include "ace/SOCK_Connector.h"
-#include "ace/Log_Msg.h"
ACE_RCSID (orbsvcs,
IOR_Multicast,
"$Id$")
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
ACE_HANDLE
TAO_IOR_Multicast::get_handle (void) const
{
@@ -125,7 +122,7 @@ TAO_IOR_Multicast::common_init (const char *ior,
{
if (this->mcast_dgram_.subscribe (this->mcast_addr_,
1,
- ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_.c_str())) == -1)
+ ACE_TEXT_TO_TCHAR_IN(this->mcast_nic_.c_str())) == -1)
ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "subscribe"),-1);
}
else
@@ -318,4 +315,4 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
return 0;
}
-TAO_END_VERSIONED_NAMESPACE_DECL
+