diff options
Diffstat (limited to 'ace/Multihomed_INET_Addr.cpp')
-rw-r--r-- | ace/Multihomed_INET_Addr.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp index 152127daeb4..a24f98957e3 100644 --- a/ace/Multihomed_INET_Addr.cpp +++ b/ace/Multihomed_INET_Addr.cpp @@ -55,7 +55,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, if (ret) { ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), - ACE_TEXT_CHAR_TO_TCHAR (secondary_host_names[i]), port_number)); + ACE_TEXT_TO_TCHAR_IN (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } else @@ -66,7 +66,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, return; } -#if defined (ACE_HAS_WCHAR) ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, const wchar_t host_name[], int encode, @@ -91,7 +90,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, if (ret) { ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), - ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number)); + ACE_TEXT_TO_TCHAR_IN (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } else @@ -101,7 +100,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, return; } -#endif /* ACE_HAS_WCHAR */ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, ACE_UINT32 primary_ip_addr, @@ -162,7 +160,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, return ACE_INET_Addr::set(port_number, host_name, encode, address_family); } -#if defined (ACE_HAS_WCHAR) // // WCHAR version of ::set // @@ -189,7 +186,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, return ACE_INET_Addr::set(port_number, host_name, encode, address_family); } -#endif /* ACE_HAS_WCHAR */ int ACE_Multihomed_INET_Addr::set (u_short port_number, |