AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix format specifiers used in wxLog::LogLastRepeatIfNeeded().

Browse Source 
Use "%u", not "%lu", for an unsigned parameter to fix asserts under 64 bit
platforms.

Closes #16918.
This commit is contained in:
Vadim Zeitlin 2015-03-22 00:58:45 +01:00
parent ecbfa2c122
commit 3cd55d9775
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/log.cpp
View File

@ -278,13 +278,13 @@ unsigned wxLog::LogLastRepeatIfNeeded()
// Notice that we still use wxPLURAL() to ensure that multiple // Notice that we still use wxPLURAL() to ensure that multiple
// numbers of times are correctly formatted, even though we never // numbers of times are correctly formatted, even though we never
// actually use the singular string. // actually use the singular string.
msg.Printf(wxPLURAL("The previous message repeated %lu time.", msg.Printf(wxPLURAL("The previous message repeated %u time.",
"The previous message repeated %lu times.", "The previous message repeated %u times.",
gs_prevLog.numRepeated), gs_prevLog.numRepeated),
gs_prevLog.numRepeated); gs_prevLog.numRepeated);
} }
#else #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); gs_prevLog.numRepeated);
#endif #endif
gs_prevLog.numRepeated = 0; gs_prevLog.numRepeated = 0;
@ -306,12 +306,12 @@ wxLog::~wxLog()
#if wxUSE_INTL #if wxUSE_INTL
wxPLURAL wxPLURAL
( (
"Last repeated message (\"%s\", %lu time) wasn't output", "Last repeated message (\"%s\", %u time) wasn't output",
"Last repeated message (\"%s\", %lu times) wasn't output", "Last repeated message (\"%s\", %u times) wasn't output",
gs_prevLog.numRepeated gs_prevLog.numRepeated
), ),
#else #else
wxS("Last repeated message (\"%s\", %lu time(s)) wasn't output"), wxS("Last repeated message (\"%s\", %u time(s)) wasn't output"),
#endif #endif
gs_prevLog.msg, gs_prevLog.msg,
gs_prevLog.numRepeated gs_prevLog.numRepeated