luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 15:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/pwithnall/disable-assert' into 'master'

Browse Source 
gfileicon: Fix unused-but-set variable with G_DISABLE_ASSERT

See merge request GNOME/glib!1769
This commit is contained in:
Philip Withnall
2020-11-24 10:10:26 +00:00
parent d78778cc46 44c4e42151
commit 9aaac19173
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gfileicon.c
View File

@@ -114,12 +114,12 @@ g_file_icon_set_property (GObject *object,
static void static void
g_file_icon_constructed (GObject *object) g_file_icon_constructed (GObject *object)
{ {
GFileIcon *icon; #ifndef G_DISABLE_ASSERT
GFileIcon *icon = G_FILE_ICON (object);
#endif
G_OBJECT_CLASS (g_file_icon_parent_class)->constructed (object); G_OBJECT_CLASS (g_file_icon_parent_class)->constructed (object);
icon = G_FILE_ICON (object);
/* Must have be set during construction */ /* Must have be set during construction */
g_assert (icon->file != NULL); g_assert (icon->file != NULL);
} }