summaryrefslogtreecommitdiff
path: root/ACE/ace/Log_Msg.cpp
diff options
context:
space:
mode:
authorChad Elliott <elliottc@objectcomputing.com>2019-06-06 09:15:02 -0500
committerChad Elliott <elliottc@objectcomputing.com>2019-06-06 09:15:02 -0500
commit4c69b74225cf6d9479caa7a31ab38fa6d70ad669 (patch)
treed2d2f9fb0d357c58063bc310c2c82d4f200b9321 /ACE/ace/Log_Msg.cpp
parenta580273d5fc7a820ab23b1aa40faf23e97063000 (diff)
downloadATCD-4c69b74225cf6d9479caa7a31ab38fa6d70ad669.tar.gz
- Use ACE_OS::send and ACE_OS::recv on MQX, instead of write and read.
- Added static casts where pid_t is assumed to be an int. - Use configurable macro for the "use_select" parameter. - MQX does not follow conventional standards when it comes to HTONS and NTOHS and must be configured accordingly. - Modified ACE_Handle_Set so that the use of fd_array is not conditional upon ACE_WIN32. It is now enabled through ACE_HANDLE_SET_USES_FD_ARRAY. - Implement UNIX File IO Functions for MQX in MQX_Filesystem.* - Use the existing implementation to simulate condition variables. - Use emulation for diropen on MQX as is done for Windows. - Convert from MQX error to standard error number. - Use _mqx_exit in ACE_OS::_exit for MQX. - Added a nop in ACE_OS::ioctl for MQX. - Added a definition of ACE_TMAIN for MQX so that MQX is initialized and RTCS and the MQX Filesystem code is initialized before calling ace_main_i(). - Fixed a compile error in SOCK_Dgram.cpp introduced months ago. - Use struct initialization to avoid using the l_linger member directly. - Modified ACE_Select_Reactor_Base to use a hash map for handle storage based on ACE_SELECT_REACTOR_BASE_USES_HASH_MAP instead of ACE_WIN32. - Added the IAR compiler to define ACE_NOTREACHED(a) as empty. - Made ACE_IPPROTO_TCP conditionally defined. - Added error values required for ACE. - Skip the wide-character strtok test if ACE_LACKS_WCSTOK is defined in ACE/tests/OS_Test.cpp. - Added the ability to compile tests so that they output to stderr instead of a file.
Diffstat (limited to 'ACE/ace/Log_Msg.cpp')
-rw-r--r--ACE/ace/Log_Msg.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 190c6d7815d..d1dcc1c449e 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)
@@ -1000,7 +1000,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_;
@@ -1672,7 +1672,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) &&