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

Fix harmless unused parameters warnings in builds without wxLogTrace().

Browse Source 
Fix warnings appearing when building with --disable-debug under Unix by
either referencing the parameters or variables which become unused then,
because wxLogTrace() calls are compiled out, or by not compiling the code
whose only purpose is to call wxLogTrace() at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-06-29 23:39:09 +00:00
parent 91da43cf22
commit 6446625f96
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/fswatchercmn.cpp
View File

@ -144,9 +144,12 @@ wxFileSystemWatcherBase::AddAny(const wxFileName& path,
else
{
wxFSWatchInfo& watch2 = it->second;
int count = watch2.IncRef();
const int count = watch2.IncRef();
wxLogTrace(wxTRACE_FSWATCHER,
"'%s' is now watched %d times", canonical, count);
wxUnusedVar(count); // could be unused if debug tracing is disabled
}
return true;
}

13
src/common/translation.cpp
View File

@ -96,6 +96,8 @@ wxStringToStringHashMap gs_msgIdCharset;
// Platform specific helpers
// ----------------------------------------------------------------------------
#if wxUSE_LOG_TRACE
void LogTraceArray(const char *prefix, const wxArrayString& arr)
{
wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, wxJoin(arr, ','));
@ -108,6 +110,13 @@ void LogTraceLargeArray(const wxString& prefix, const wxArrayString& arr)
wxLogTrace(TRACE_I18N, " %s", *i);
}
#else // !wxUSE_LOG_TRACE
#define LogTraceArray(prefix, arr)
#define LogTraceLargeArray(prefix, arr)
#endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE
// Use locale-based detection as a fallback
wxString GetPreferredUILanguageFallback(const wxArrayString& WXUNUSED(available))
{
@ -181,6 +190,8 @@ wxString GetPreferredUILanguage(const wxArrayString& available)
#elif defined(__WXOSX__)
#if wxUSE_LOG_TRACE
void LogTraceArray(const char *prefix, CFArrayRef arr)
{
wxString s;
@ -194,6 +205,8 @@ void LogTraceArray(const char *prefix, CFArrayRef arr)
wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, s);
}
#endif // wxUSE_LOG_TRACE
wxString GetPreferredUILanguage(const wxArrayString& available)
{
wxStringToStringHashMap availableNormalized;

2
src/unix/stackwalk.cpp
View File

@ -215,6 +215,8 @@ bool ReadLine(FILE* fp, unsigned long num, wxString* line)
{
if ( !fgets(g_buf, WXSIZEOF(g_buf), fp) )
{
wxUnusedVar(num); // could be unused if debug tracing is disabled
wxLogDebug(wxS("cannot read address information for stack frame #%lu"),
num);
return false;