mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-23 22:16:16 +01:00
gobject: Fix various compiler warnings when compiling with G_DISABLE_ASSERT
Mostly unused variables which are only used in a g_assert() call otherwise. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #1708
This commit is contained in:
parent
faa1d63cab
commit
3d3ca9f1fe
@ -100,7 +100,7 @@ _g_boxed_type_init (void)
|
||||
NULL, /* value_table */
|
||||
};
|
||||
const GTypeFundamentalInfo finfo = { G_TYPE_FLAG_DERIVABLE, };
|
||||
GType type;
|
||||
GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
|
||||
|
||||
/* G_TYPE_BOXED
|
||||
*/
|
||||
|
@ -113,7 +113,7 @@ _g_enum_types_init (void)
|
||||
static const GTypeFundamentalInfo finfo = {
|
||||
G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_DERIVABLE,
|
||||
};
|
||||
GType type;
|
||||
GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
|
||||
|
||||
g_return_if_fail (initialized == FALSE);
|
||||
initialized = TRUE;
|
||||
|
@ -381,7 +381,7 @@ _g_object_type_init (void)
|
||||
"p", /* lcopy_format */
|
||||
g_value_object_lcopy_value, /* lcopy_value */
|
||||
};
|
||||
GType type;
|
||||
GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
|
||||
|
||||
g_return_if_fail (initialized == FALSE);
|
||||
initialized = TRUE;
|
||||
|
@ -1191,11 +1191,16 @@ void
|
||||
_g_param_spec_types_init (void)
|
||||
{
|
||||
const guint n_types = 23;
|
||||
GType type, *spec_types, *spec_types_bound;
|
||||
GType type, *spec_types;
|
||||
#ifndef G_DISABLE_ASSERT
|
||||
GType *spec_types_bound;
|
||||
#endif
|
||||
|
||||
g_param_spec_types = g_new0 (GType, n_types);
|
||||
spec_types = g_param_spec_types;
|
||||
#ifndef G_DISABLE_ASSERT
|
||||
spec_types_bound = g_param_spec_types + n_types;
|
||||
#endif
|
||||
|
||||
/* G_TYPE_PARAM_CHAR
|
||||
*/
|
||||
|
@ -4362,7 +4362,7 @@ gobject_init (void)
|
||||
const gchar *env_string;
|
||||
GTypeInfo info;
|
||||
TypeNode *node;
|
||||
GType type;
|
||||
GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
|
||||
|
||||
/* Ensure GLib is initialized first, see
|
||||
* https://bugzilla.gnome.org/show_bug.cgi?id=756139
|
||||
|
@ -435,7 +435,7 @@ _g_value_types_init (void)
|
||||
NULL, /* value_table */
|
||||
};
|
||||
const GTypeFundamentalInfo finfo = { G_TYPE_FLAG_DERIVABLE, };
|
||||
GType type;
|
||||
GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
|
||||
|
||||
/* G_TYPE_CHAR / G_TYPE_UCHAR
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user