[NetworkManager-openvpn/lr/gtk-4.0: 2/10] glib: always re-implement g_steal_pointer()
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [NetworkManager-openvpn/lr/gtk-4.0: 2/10] glib: always re-implement g_steal_pointer()
- Date: Fri, 14 Jan 2022 18:21:58 +0000 (UTC)
commit 3a35c228b6d999b748abb23361977de2d3cd9946
Author: Thomas Haller <thaller redhat com>
Date: Mon Jun 15 15:56:30 2020 +0200
glib: always re-implement g_steal_pointer()
g_steal_pointer() is marked as GLIB_AVAILABLE_STATIC_INLINE_IN_2_44,
that means we get a deprecated warning. Avoid that. We anyway
re-implement the macro so that we can use it before 2.44 and so
that it always does the typeof() cast.
(imported from NetworkManager commit edfe9fa9a23422b54438c49588562b0838d80908)
shared/nm-utils/nm-glib.h | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h
index 3f2a526..9426a16 100644
--- a/shared/nm-utils/nm-glib.h
+++ b/shared/nm-utils/nm-glib.h
@@ -419,9 +419,8 @@ _nm_g_hash_table_get_keys_as_array (GHashTable *hash_table,
/*****************************************************************************/
-#if !GLIB_CHECK_VERSION(2, 44, 0)
static inline gpointer
-g_steal_pointer (gpointer pp)
+_nm_g_steal_pointer (gpointer pp)
{
gpointer *ptr = (gpointer *) pp;
gpointer ref;
@@ -431,13 +430,20 @@ g_steal_pointer (gpointer pp)
return ref;
}
+
+#if !GLIB_CHECK_VERSION(2, 44, 0)
+static inline gpointer
+g_steal_pointer (gpointer pp)
+{
+ return _nm_g_steal_pointer (pp);
+}
#endif
#ifdef g_steal_pointer
#undef g_steal_pointer
#endif
#define g_steal_pointer(pp) \
- ((typeof (*(pp))) g_steal_pointer (pp))
+ ((typeof (*(pp))) _nm_g_steal_pointer (pp))
/*****************************************************************************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]