diff options
| -rw-r--r-- | ace/Codecs.cpp | 8 | ||||
| -rw-r--r-- | ace/Configuration.cpp | 2 | ||||
| -rw-r--r-- | ace/DLL_Manager.cpp | 4 | ||||
| -rw-r--r-- | ace/Multihomed_INET_Addr.cpp | 4 | ||||
| -rw-r--r-- | ace/OS_NS_stdlib.cpp | 2 | ||||
| -rw-r--r-- | ace/Service_Config.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/ace/Codecs.cpp b/ace/Codecs.cpp index ebacffa2fa4..8e717cb4533 100644 --- a/ace/Codecs.cpp +++ b/ace/Codecs.cpp @@ -160,8 +160,8 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) { if (char_count) { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Decoding incomplete: atleast %d bits truncated\n"), + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("Decoding incomplete: atleast %d bits truncated\n"), (4 - char_count) * 6)); errors++; } @@ -171,8 +171,8 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) switch (char_count) { case 1: - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Decoding incomplete: atleast 2 bits missing\n"))); + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("Decoding incomplete: atleast 2 bits missing\n"))); errors++; break; case 2: diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 5f71e30aa24..43432914f8e 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -1641,7 +1641,7 @@ ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, result = base; for (const ACE_TCHAR* separator; - (separator = ACE_OS::strchr (sub_section, ACE_TEXT ('\\'))) != 0; + (separator = ACE_OS::strchr (sub_section, ACE_LIB_TEXT ('\\'))) != 0; ) { ACE_TString simple_section (sub_section, separator - sub_section); diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp index 377ecb39a81..72702a845e9 100644 --- a/ace/DLL_Manager.cpp +++ b/ace/DLL_Manager.cpp @@ -131,7 +131,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, ACE_LIB_TEXT ("ACE_DLL_Handle::open: Trying to open DLL %s with %s name\n"), this->dll_name_, name->c_str ())); - + // The ACE_SHLIB_HANDLE object is obtained. this->handle_ = ACE_OS::dlopen (name->c_str (), open_mode); @@ -334,7 +334,7 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, // 2. Locate the file suffix, if there is one. Move the '.' and the // suffix to base_suffix. - if ((pos = base_file.rfind (ACE_TEXT ('.'))) != ACE_TString::npos) + if ((pos = base_file.rfind (ACE_LIB_TEXT ('.'))) != ACE_TString::npos) { base_suffix = base_file.substr (static_cast<size_t>(pos)); base_file = base_file.substr (0, static_cast<ssize_t>(pos)); diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp index 0e28b6ce3c0..294f2858c37 100644 --- a/ace/Multihomed_INET_Addr.cpp +++ b/ace/Multihomed_INET_Addr.cpp @@ -52,7 +52,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, address_family); if (ret) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), + ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), ACE_TEXT_CHAR_TO_TCHAR (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } @@ -88,7 +88,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, address_family); if (ret) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), + ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp index c66f24dae2f..91313277342 100644 --- a/ace/OS_NS_stdlib.cpp +++ b/ace/OS_NS_stdlib.cpp @@ -602,7 +602,7 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s) } // The "XXXXXX" template to be filled in. - ACE_TCHAR * const t = ACE_OS::strstr (s, ACE_TEXT ("XXXXXX")); + ACE_TCHAR * const t = ACE_OS::strstr (s, ACE_LIB_TEXT ("XXXXXX")); if (t == 0) { diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 58d164b0de7..23080f92530 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -403,7 +403,7 @@ ACE_Service_Config::get_xml_svc_conf (ACE_DLL &xmldll) reinterpret_cast<ACE_XML_Svc_Conf::Factory> (tmp); if (factory == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unable to resolve factory: %p\n"), + ACE_LIB_TEXT ("Unable to resolve factory: %p\n"), xmldll.error ()), 0); |