diff options
| author | ocielliottc <elliottc@objectcomputing.com> | 2019-06-24 07:52:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 07:52:53 -0500 |
| commit | de6952566c18e2fb7bc049dfac5814f6e53cf72f (patch) | |
| tree | c1c95a7c952ad3d85cd6fd2e6f629b54ef38bbee /ACE/ace/Log_Msg.cpp | |
| parent | b1dee1f113c794e8df239a4b164458db63ab8507 (diff) | |
| parent | 2f7a952cc6fc23b73d3bcba0c50f5ae7c6400488 (diff) | |
| download | ATCD-de6952566c18e2fb7bc049dfac5814f6e53cf72f.tar.gz | |
Merge pull request #917 from ocielliottc/master
Adding support for the MQX RTOS.
Diffstat (limited to 'ACE/ace/Log_Msg.cpp')
| -rw-r--r-- | ACE/ace/Log_Msg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index aa2e354b068..9e3f3949e52 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -19,7 +19,7 @@ #include "ace/os_include/os_typeinfo.h" #if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0) -# include "ace/Object_Manager_Base.h" +# include "ace/Object_Manager.h" #endif /* ! ACE_MT_SAFE */ #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -999,7 +999,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #else // External decls. - typedef void (*PTF)(...); + typedef void (*PointerToFunction)(...); // Check if there were any conditional values set. bool const conditional_values = this->conditional_values_.is_set_; @@ -1671,7 +1671,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } ACE_Log_Msg::msg_off_ = bp - this->msg_; - (*va_arg (argp, PTF))(); + (*va_arg (argp, PointerToFunction))(); if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::SILENT) && |