diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-11-12 09:59:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-11-12 09:59:19 +0000 |
| commit | 366c7cd60bf36b542736b45803b7e2f7b96b6d59 (patch) | |
| tree | 3c3505741c925413388cd434335d6c9b941253a1 /ACE/ace/Log_Msg.cpp | |
| parent | af54477eecf347771464faa234ee9fc111319145 (diff) | |
| download | ATCD-366c7cd60bf36b542736b45803b7e2f7b96b6d59.tar.gz | |
Tue Nov 12 09:56:49 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Log_Msg.cpp:
Fixed logging of stack trace on Windows with wchar enabled
* ace/Stack_Trace.h:
Fixed incorrect log msg format mask
* docs/bczar/bczar.html:
Added package
* tests/Proactor_Scatter_Gather_Test.cpp:
* tests/Proactor_Test.cpp:
* tests/Proactor_Test_IPV6.cpp:
* tests/Proactor_Timer_Test.cpp:
* tests/Proactor_UDP_Test.cpp:
Added missing newline
* tests/UUID_Test.cpp:
* tests/Wild_Match_Test.cpp:
Fixed logging in case of unicode
Diffstat (limited to 'ACE/ace/Log_Msg.cpp')
| -rw-r--r-- | ACE/ace/Log_Msg.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 47b3f535c1f..840865c110b 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -2072,7 +2072,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { // skip the frame that we're currently in ACE_Stack_Trace t(2); +#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) + ACE_OS::strcpy (fp, ACE_TEXT ("S")); +#else /* ACE_WIN32 && ACE_USES_WCHAR */ ACE_OS::strcpy (fp, ACE_TEXT ("s")); +#endif /* ACE_WIN32 && ACE_USES_WCHAR */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, t.c_str ()); |