From 41e459627efecd9d767074f2c83aed62892dac24 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Mar 2015 00:58:45 +0100 Subject: [PATCH] Fix format specifiers used in wxLog::LogLastRepeatIfNeeded(). Use "%u", not "%lu", for an unsigned parameter to fix asserts under 64 bit platforms. Closes #16918. --- src/common/log.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/log.cpp b/src/common/log.cpp index 3180f46743..9d32a5e6a2 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -278,13 +278,13 @@ unsigned wxLog::LogLastRepeatIfNeeded() // Notice that we still use wxPLURAL() to ensure that multiple // numbers of times are correctly formatted, even though we never // actually use the singular string. - msg.Printf(wxPLURAL("The previous message repeated %lu time.", - "The previous message repeated %lu times.", + msg.Printf(wxPLURAL("The previous message repeated %u time.", + "The previous message repeated %u times.", gs_prevLog.numRepeated), gs_prevLog.numRepeated); } #else - msg.Printf(wxS("The previous message was repeated %lu time(s)."), + msg.Printf(wxS("The previous message was repeated %u time(s)."), gs_prevLog.numRepeated); #endif gs_prevLog.numRepeated = 0; @@ -306,12 +306,12 @@ wxLog::~wxLog() #if wxUSE_INTL wxPLURAL ( - "Last repeated message (\"%s\", %lu time) wasn't output", - "Last repeated message (\"%s\", %lu times) wasn't output", + "Last repeated message (\"%s\", %u time) wasn't output", + "Last repeated message (\"%s\", %u times) wasn't output", gs_prevLog.numRepeated ), #else - wxS("Last repeated message (\"%s\", %lu time(s)) wasn't output"), + wxS("Last repeated message (\"%s\", %u time(s)) wasn't output"), #endif gs_prevLog.msg, gs_prevLog.numRepeated