From f675b4f521c6696648674d8901e2d6162ab5e2fb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Jul 2010 13:42:49 +0000 Subject: [PATCH] Fix harmless unused parameter warnings in wxDEBUG_LEVEL==0 build. These warnings were harmless as they concerned the parameters used inside wxASSERTs only but there were hundreds if not thousands of them in wx/strvararg.h alone so all the rest of build output was completely lost in them. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/strvararg.h | 6 +++++- src/common/intl.cpp | 2 +- src/gtk/evtloop.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index db91346e67..7dc6612171 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -318,7 +318,11 @@ struct wxFormatStringArgumentFinder "format specifier doesn't match argument type" ); \ } while ( wxFalse ) #else - #define wxASSERT_ARG_TYPE(fmt, index, expected_mask) + // Just define it to suppress "unused parameter" warnings for the + // parameters which we don't use otherwise + #define wxASSERT_ARG_TYPE(fmt, index, expected_mask) \ + wxUnusedVar(fmt); \ + wxUnusedVar(index) #endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 25152b4cb8..4e8542a1c4 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -238,7 +238,7 @@ bool wxLocale::Init(const wxString& name, const wxString& locale, bool bLoadDefault #if WXWIN_COMPATIBILITY_2_8 - ,bool bConvertEncoding + ,bool WXUNUSED_UNLESS_DEBUG(bConvertEncoding) #endif ) { diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp index 58e5a4f478..54b216836a 100644 --- a/src/gtk/evtloop.cpp +++ b/src/gtk/evtloop.cpp @@ -91,7 +91,7 @@ void wxGUIEventLoop::WakeUp() extern "C" { -static gboolean wx_on_channel_event(GIOChannel *channel, +static gboolean wx_on_channel_event(GIOChannel * WXUNUSED_UNLESS_DEBUG(channel), GIOCondition condition, gpointer data) { -- 2.45.2