From 67aebc3b8b8dfe7ee6151d0c2097e25305eca3ec Mon Sep 17 00:00:00 2001 From: Hubert Figuiere Date: Mon, 1 Dec 2008 07:14:08 +0000 Subject: Change the way unused variables are marked. Bug #562716 * glib/src/markup.ccg: Change the way unused variables are marked. Bug #562716 svn path=/trunk/; revision=748 --- ChangeLog | 5 +++++ glib/src/markup.ccg | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0295886c..2209d9af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-01 Hubert Figuiere + + * glib/src/markup.ccg: Change the way unused variables + are marked. Bug #562716 + 2008-11-29 Hubert Figuiere * glib/src/nodetree.hg: Fix -Wshadow warnings. Bug #555743. diff --git a/glib/src/markup.ccg b/glib/src/markup.ccg index e62a3553..111db37e 100644 --- a/glib/src/markup.ccg +++ b/glib/src/markup.ccg @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id$ */ +/* $Id: markup.ccg,v 1.5 2006/10/04 12:04:09 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -98,7 +98,7 @@ void ParserCallbacks::start_element(GMarkupParseContext* context, void* user_data, GError** error) { - if(!&error) error = error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. + (void)error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. ParseContext& cpp_context = *static_cast(user_data); g_return_if_fail(context == cpp_context.gobj()); @@ -139,7 +139,7 @@ void ParserCallbacks::end_element(GMarkupParseContext* context, void* user_data, GError** error) { - if(!&error) error = error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. + (void)error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. ParseContext& cpp_context = *static_cast(user_data); g_return_if_fail(context == cpp_context.gobj()); @@ -168,7 +168,7 @@ void ParserCallbacks::text(GMarkupParseContext* context, void* user_data, GError** error) { - if(!&error) error = error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. + (void)error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. ParseContext& cpp_context = *static_cast(user_data); g_return_if_fail(context == cpp_context.gobj()); @@ -197,7 +197,7 @@ void ParserCallbacks::passthrough(GMarkupParseContext* context, void* user_data, GError** error) { - if(!&error) error = error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. + (void)error; //Avoid an unused parameter warning when GLIBMM_EXCEPTIONS_ENABLED is used. ParseContext& cpp_context = *static_cast(user_data); g_return_if_fail(context == cpp_context.gobj()); -- cgit v1.2.1