Commit 2aacef39 authored by Iain Lane's avatar Iain Lane

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

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__().
parent 449dcca1
......@@ -3378,7 +3378,7 @@ g_object_unref (gpointer _object)
**/
#undef g_clear_object
void
g_clear_object (volatile GObject **object_ptr)
g_clear_object (GObject **object_ptr)
{
g_clear_pointer (object_ptr, g_object_unref);
}
......
......@@ -668,7 +668,7 @@ G_STMT_START { \
G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
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)
/**
......
......@@ -132,7 +132,7 @@ test_clear (void)
static void
test_clear_function (void)
{
volatile GObject *o = NULL;
GObject *o = NULL;
GObject *tmp;
(g_clear_object) (&o);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment