luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 12:25:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

gobject: Make g_clear_object take a non-volatile GObject **

Browse Source 
The implementation is silently discarding this anyway, and
g_object_unref() is using atomic operations. So this should be safe.

Having this here triggers -Wdiscarded-qualifiers when g_clear_pointer()
is fixed to use __typeof__().
This commit is contained in:
Iain Lane 2018-07-11 10:18:08 +01:00
parent 449dcca106
commit 2aacef39b1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gobject/gobject.c
View File

@ -3378,7 +3378,7 @@ g_object_unref (gpointer _object)
**/ **/
#undef g_clear_object #undef g_clear_object
void void
g_clear_object (volatile GObject **object_ptr) g_clear_object (GObject **object_ptr)
{ {
g_clear_pointer (object_ptr, g_object_unref); g_clear_pointer (object_ptr, g_object_unref);
} }

2
gobject/gobject.h
View File

@ -668,7 +668,7 @@ G_STMT_START { \
G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec)) G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_clear_object (volatile GObject **object_ptr); void g_clear_object (GObject **object_ptr);
#define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref) #define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref)
/** /**

2
gobject/tests/reference.c
View File

@ -132,7 +132,7 @@ test_clear (void)
static void static void
test_clear_function (void) test_clear_function (void)
{ {
volatile GObject *o = NULL; GObject *o = NULL;
GObject *tmp; GObject *tmp;
(g_clear_object) (&o); (g_clear_object) (&o);