summaryrefslogtreecommitdiff
path: root/ace/Log_Msg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Log_Msg.cpp')
-rw-r--r--ace/Log_Msg.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index beaa850dd31..8e0e72ef321 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -791,7 +791,7 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
else
{
status =
- ACE_Log_Msg_Manager::log_backend_->open (logger_key);
+ ACE_Log_Msg_Manager::log_backend_->open (prog_name);
}
if (status == -1)
@@ -804,8 +804,8 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
ACE_SET_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG);
}
}
- else if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER) ||
- ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG))
+ else if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER)
+ || ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG))
{
// If we are closing down logger, redirect logging to stderr.
ACE_CLR_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER);
@@ -1787,8 +1787,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
// On some platforms sizeof (wchar_t) can be 2
// on the others 4 ...
wchar_t wtchar =
- ACE_static_cast(wchar_t,
- va_arg (argp, int));
+ static_cast<wchar_t> (va_arg (argp, int));
#if defined (ACE_WIN32)
# if defined (ACE_USES_WCHAR)
ACE_OS::strcpy (fp, ACE_LIB_TEXT ("c"));