luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_clear_pointer: work around gcc helpfulness

Browse Source 
gcc gets upset when we do "((GDestroyNotify) destroy) (_p)" because
it's non-portable. But we don't care; we already know glib wouldn't
work on any platform where different pointer types have different
calling conventions. So tweak the code to avoid the warning.

https://bugzilla.gnome.org/show_bug.cgi?id=674634
This commit is contained in:
Dan Winship 2012-05-10 13:29:39 -04:00
parent 787f808783
commit 0ecbb0a404
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gmem.h
View File

@ -103,6 +103,8 @@ gpointer g_try_realloc_n (gpointer mem,
/* Only one access, please */ \ /* Only one access, please */ \
gpointer *_pp = (gpointer *) (pp); \ gpointer *_pp = (gpointer *) (pp); \
gpointer _p; \ gpointer _p; \
/* This assignment is needed to avoid a gcc warning */ \
GDestroyNotify _destroy = (GDestroyNotify) (destroy); \
\ \
(void) (0 ? (gpointer) *(pp) : 0); \ (void) (0 ? (gpointer) *(pp) : 0); \
do \ do \
@ -110,7 +112,7 @@ gpointer g_try_realloc_n (gpointer mem,
while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \ while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
\ \
if (_p) \ if (_p) \
((GDestroyNotify) (destroy)) (_p); \ _destroy (_p); \
} G_STMT_END } G_STMT_END
/* Optimise: avoid the call to the (slower) _n function if we can /* Optimise: avoid the call to the (slower) _n function if we can