mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Revert "Merge branch 'type-safe-g-clear-pointer-1425' into 'master'"
This reverts merge request !165
This commit is contained in:
parent
aa6721f1ee
commit
d3881bb1bf
11
glib/gmem.h
11
glib/gmem.h
@ -110,16 +110,6 @@ gpointer g_try_realloc_n (gpointer mem,
|
||||
gsize n_blocks,
|
||||
gsize n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58
|
||||
#define g_clear_pointer(pp, destroy) \
|
||||
G_STMT_START { \
|
||||
G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
|
||||
__typeof__(*(pp)) _ptr = *(pp); \
|
||||
*(pp) = NULL; \
|
||||
if (_ptr) \
|
||||
destroy (_ptr); \
|
||||
} G_STMT_END
|
||||
#else /* __GNUC__ */
|
||||
#define g_clear_pointer(pp, destroy) \
|
||||
G_STMT_START { \
|
||||
G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
|
||||
@ -137,7 +127,6 @@ gpointer g_try_realloc_n (gpointer mem,
|
||||
_destroy (_p); \
|
||||
} \
|
||||
} G_STMT_END
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
/**
|
||||
* g_steal_pointer:
|
||||
|
@ -3378,7 +3378,7 @@ g_object_unref (gpointer _object)
|
||||
**/
|
||||
#undef g_clear_object
|
||||
void
|
||||
g_clear_object (GObject **object_ptr)
|
||||
g_clear_object (volatile 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 (GObject **object_ptr);
|
||||
void g_clear_object (volatile 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)
|
||||
{
|
||||
GObject *o = NULL;
|
||||
volatile GObject *o = NULL;
|
||||
GObject *tmp;
|
||||
|
||||
(g_clear_object) (&o);
|
||||
|
Loading…
Reference in New Issue
Block a user