luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 18:16:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtype: Simplify g_type_test_flags() for node flags checks only

Browse Source 
And this will affect G_TYPE_IS_FINAL, G_TYPE_IS_CLASSED,
G_TYPE_IS_INSTANTIATABLE and mixes of them.
This commit is contained in:
Marco Trevisan (Treviño)
2022-12-12 18:09:16 +01:00
parent a31b042dfc
commit 5dc8d2ca00
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gobject/gtype.c
View File

@@ -146,6 +146,13 @@
G_TYPE_FLAG_DERIVABLE | \ G_TYPE_FLAG_DERIVABLE | \
G_TYPE_FLAG_DEEP_DERIVABLE) G_TYPE_FLAG_DEEP_DERIVABLE)
#define TYPE_FLAG_MASK (G_TYPE_FLAG_ABSTRACT | G_TYPE_FLAG_VALUE_ABSTRACT | G_TYPE_FLAG_FINAL | G_TYPE_FLAG_DEPRECATED) #define TYPE_FLAG_MASK (G_TYPE_FLAG_ABSTRACT | G_TYPE_FLAG_VALUE_ABSTRACT | G_TYPE_FLAG_FINAL | G_TYPE_FLAG_DEPRECATED)
/* List the flags that are directly accessible via the TypeNode struct flags */
#define NODE_FLAG_MASK ( \
G_TYPE_FLAG_CLASSED | \
G_TYPE_FLAG_INSTANTIATABLE | \
G_TYPE_FLAG_FINAL)
#define SIZEOF_FUNDAMENTAL_INFO ((gssize) MAX (MAX (sizeof (GTypeFundamentalInfo), \ #define SIZEOF_FUNDAMENTAL_INFO ((gssize) MAX (MAX (sizeof (GTypeFundamentalInfo), \
sizeof (gpointer)), \ sizeof (gpointer)), \
sizeof (glong))) sizeof (glong)))
@@ -3994,6 +4001,20 @@ g_type_test_flags (GType type,
node = lookup_type_node_I (type); node = lookup_type_node_I (type);
if (node) if (node)
{ {
if ((flags & ~NODE_FLAG_MASK) == 0)
{
if (flags & G_TYPE_FLAG_CLASSED)
result |= node->is_classed;
if (flags & G_TYPE_FLAG_INSTANTIATABLE)
result |= node->is_instantiatable;
if (flags & G_TYPE_FLAG_FINAL)
result |= node->is_final;
return result;
}
guint fflags = flags & TYPE_FUNDAMENTAL_FLAG_MASK; guint fflags = flags & TYPE_FUNDAMENTAL_FLAG_MASK;
guint tflags = flags & TYPE_FLAG_MASK; guint tflags = flags & TYPE_FLAG_MASK;