summaryrefslogtreecommitdiff
path: root/ACE/ace/Log_Msg.cpp
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-11-12 11:19:31 -0600
committerAdam Mitz <mitza@ociweb.com>2015-11-12 11:19:31 -0600
commitba6531d244b0ab03186baeecd0a49fa6f4a50295 (patch)
tree405b235f920c1b55b5654ea56b65524d2b085fad /ACE/ace/Log_Msg.cpp
parent74f5d92308ff3d0ae6012b2e4e4d3986c8ff5e8d (diff)
downloadATCD-ba6531d244b0ab03186baeecd0a49fa6f4a50295.tar.gz
Fixed fuzz checks and wchar build problems.
Diffstat (limited to 'ACE/ace/Log_Msg.cpp')
-rw-r--r--ACE/ace/Log_Msg.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 03bc08fec39..8beec80f503 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1804,10 +1804,16 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
ACE_OS::sprintf (bp,
format,
static_cast <unsigned> (ACE_Thread::self ()));
+#elif defined ACE_USES_WCHAR
+ {
+ char tid_buf[32] = {};
+ ACE_OS::thr_id (tid_buf, sizeof tid_buf);
+ this_len = ACE_OS::strlen (tid_buf);
+ ACE_OS::strncpy (bp, ACE_TEXT_CHAR_TO_TCHAR (tid_buf),
+ bspace);
+ }
#else
-
- this_len = ACE_OS::thr_id (bp, bspace);
-
+ this_len = ACE_OS::thr_id (bp, bspace);
#endif /* ACE_WIN32 */
ACE_UPDATE_COUNT (bspace, this_len);
break;