From dd6c5779ec5e86ba8755efc77f632a6ffedb6414 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 15 Jan 2014 18:28:51 +0100 Subject: Using a 2nd argument instead of va_copy(). This seems to be the only reasonable C++03-only solution. --- src/Log.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/Log.cpp') diff --git a/src/Log.cpp b/src/Log.cpp index a0de4531b..8f811f14f 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -99,10 +99,10 @@ void cLog::ClearLog() -void cLog::Log(const char * a_Format, va_list argList) +void cLog::Log(const char * a_Format, va_list argList, va_list argListCopy) { AString Message; - AppendVPrintf(Message, a_Format, argList); + AppendVPrintf(Message, a_Format, argList, argListCopy); time_t rawtime; time ( &rawtime ); @@ -147,11 +147,13 @@ void cLog::Log(const char * a_Format, va_list argList) -void cLog::Log(const char* a_Format, ...) +void cLog::Log(const char * a_Format, ...) { - va_list argList; + va_list argList, argListCopy; va_start(argList, a_Format); - Log( a_Format, argList ); + va_start(argListCopy, a_Format); + Log(a_Format, argList, argListCopy); + va_end(argListCopy); va_end(argList); } @@ -159,9 +161,9 @@ void cLog::Log(const char* a_Format, ...) -void cLog::SimpleLog(const char* a_String) +void cLog::SimpleLog(const char * a_String) { - Log("%s", a_String ); + Log("%s", a_String); } -- cgit v1.2.3