diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-31 07:17:04 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-31 07:17:04 +0000 |
| commit | 2d0de71cddc8bd04853bcf3dae07e022685b365e (patch) | |
| tree | 5d3a1039e1d4ac47a7a5e219d4855ede36f4f6fd | |
| parent | 8bfb6fbef623c3f90273448b87a7ee6898a6258c (diff) | |
| download | ATCD-2d0de71cddc8bd04853bcf3dae07e022685b365e.tar.gz | |
ChangeLogTag: Mon Jan 31 07:15:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ace/ace_wchar.h | 2 | ||||
| -rw-r--r-- | examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 86e127bc8e6..07ee2b39cc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Jan 31 07:16:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_wchar.h: + Added ACE_TEXT_OutputDebugString + + * examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp: + Use ACE_TEXT_OutputDebugString instead of ::OutputDebugString + to fix compile errors in wchar builds + Sun Jan 30 08:46:56 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * ace/Filecache.cpp: diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index 8b115c13cb6..d118c3ce3b6 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -264,6 +264,7 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString; #define ACE_TEXT_OpenFileMapping ::OpenFileMappingW #define ACE_TEXT_OpenSCManager ::OpenSCManagerW #define ACE_TEXT_OpenService ::OpenServiceW +#define ACE_TEXT_OutputDebugString ::OutputDebugStringW #define ACE_TEXT_RegisterEventSource ::RegisterEventSourceW #define ACE_TEXT_RegisterServiceCtrlHandler ::RegisterServiceCtrlHandlerW #define ACE_TEXT_RegConnectRegistry ::RegConnectRegistryW @@ -312,6 +313,7 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString; #define ACE_TEXT_OpenFileMapping ::OpenFileMappingA #define ACE_TEXT_OpenSCManager ::OpenSCManagerA #define ACE_TEXT_OpenService ::OpenServiceA +#define ACE_TEXT_OutputDebugString ::OutputDebugStringA #define ACE_TEXT_RegisterEventSource ::RegisterEventSourceA #define ACE_TEXT_RegisterServiceCtrlHandler ::RegisterServiceCtrlHandlerA #define ACE_TEXT_RegConnectRegistry ::RegConnectRegistryA diff --git a/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp b/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp index 4354bde10c4..18899d5611c 100644 --- a/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp +++ b/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp @@ -35,7 +35,7 @@ MFC_Log::log (ACE_Log_Record& log_record) log_record.msg_data()); #if defined (ACE_WIN32) - ::OutputDebugString(Message); + ACE_TEXT_OutputDebugString(Message); #endif /* ACE_WIN32 */ } |