diff options
| author | Bradley Bell <btb@debian.org> | 2007-03-23 17:31:16 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2007-03-23 17:31:16 +0000 |
| commit | 07799a5e3a0d797e24c7f73917a8bf2488341de8 (patch) | |
| tree | 9940f5753dc38bb21b91d8595d76c71f79e31f24 | |
| parent | 39ea9b123d116c7219d206e84b37c12ed769a754 (diff) | |
| download | glibmm-07799a5e3a0d797e24c7f73917a8bf2488341de8.tar.gz | |
Change variable name to avoid warnings about a shadowed member. Bug
2007-03-19 Bradley Bell <btb@debian.org>
* glib/glibmm/helperlist.h: Change variable name to avoid
warnings about a shadowed member.
Bug #420316.
2007-03-19 Bradley Bell <btb@debian.org>
* glib/glibmm/utility.h: remove g_free prototype, include gmem.h
instead, to avoid a warning about a redundant declaration.
Bug #420339.
svn path=/trunk/; revision=386
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | glib/glibmm/helperlist.h | 4 | ||||
| -rw-r--r-- | glib/glibmm/utility.h | 4 |
3 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2007-03-19 Bradley Bell <btb@debian.org> + + * glib/glibmm/helperlist.h: Change variable name to avoid + warnings about a shadowed member. + Bug #420316. + +2007-03-19 Bradley Bell <btb@debian.org> + + * glib/glibmm/utility.h: remove g_free prototype, include gmem.h + instead, to avoid a warning about a redundant declaration. + Bug #420339. + 2007-03-17 Armin Burgmeier <armin@openismus.com> * tools/m4/signal.m4: diff --git a/glib/glibmm/helperlist.h b/glib/glibmm/helperlist.h index 50685e80..09d625bb 100644 --- a/glib/glibmm/helperlist.h +++ b/glib/glibmm/helperlist.h @@ -36,8 +36,8 @@ public: : gparent_(0) {} - HelperList(GObject* gparent) - : gparent_(gparent) + HelperList(GObject* gp) //We use gp instead of gparent because that can cause warnings about a shadowed member. + : gparent_(gp) {} virtual ~HelperList() diff --git a/glib/glibmm/utility.h b/glib/glibmm/utility.h index 8890f9af..0020b50a 100644 --- a/glib/glibmm/utility.h +++ b/glib/glibmm/utility.h @@ -21,14 +21,12 @@ */ #include <glib/gmacros.h> +#include <glib/gmem.h> #include <glibmm/ustring.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS -extern "C" void g_free(void*); - - /* Occasionally, a struct variable has to be initialized after its definition, * i.e. when using structs as class member data. For convenience, the macro * GLIBMM_INITIALIZE_STRUCT(Var, Type) is provided. It even avoids creating |