diff options
| -rw-r--r-- | ace/Log_Msg.cpp | 2 | ||||
| -rw-r--r-- | tests/Basic_Types_Test.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index d84a05bf72f..84ed0583f92 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -851,7 +851,7 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str, ACE_Log_Msg::msg_off_ = bp - this->msg_; type = SKIP_SPRINTF; - ACE_reinterpret_cast (PTF, va_arg (argp, long))(); + (*va_arg (argp, PTF))(); if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SILENT)) { diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp index 3bf1b41653e..de8bf8d898c 100644 --- a/tests/Basic_Types_Test.cpp +++ b/tests/Basic_Types_Test.cpp @@ -153,11 +153,11 @@ main (int, ASYS_TCHAR *[]) else ACE_ERROR ((LM_ERROR, ASYS_TEXT ("sizeof (long) != sizeof (void*)\n"))); - // ACE assumes sizeof (long) == sizeof (a_function_pointer) - if (sizeof (long) == sizeof (a_function_pointer)) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("sizeof (long) == sizeof (a_function_pointer)\n"))); + // ACE assumes sizeof (long) >= sizeof (a_function_pointer) + if (sizeof (long) >= sizeof (a_function_pointer)) + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("sizeof (long) >= sizeof (a_function_pointer)\n"))); else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("sizeof (long) != sizeof (a_function_pointer)\n"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("sizeof (long) < sizeof (a_function_pointer)\n"))); #if defined (ACE_LITTLE_ENDIAN) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("little endian\n"))); |