isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Drop "volatile" from static GTypes in manual registration

Browse Source 
As documented in g_once_init_enter(): "While @location has a volatile qualifier,
this is a historical artifact and the pointer passed to it should not be
volatile.". And effectively this now warns with modern glibc.

Drop the "volatile" qualifier from these static variables as it's expected.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1785>
This commit is contained in:
Carlos Garnacho 2021-03-16 19:27:42 +01:00 committed by Marge Bot
parent 3b702886be
commit 9e10d2fa88
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cogl/cogl/cogl-gtype-private.h
View File

@ -64,16 +64,16 @@ struct _CoglGtypeClass
GType \ GType \
cogl_##underscore_name##_get_gtype (void) \ cogl_##underscore_name##_get_gtype (void) \
{ \ { \
static volatile size_t type_volatile = 0; \ static size_t g_type_id = 0; \
if (g_once_init_enter (&type_volatile)) \ if (g_once_init_enter (&g_type_id)) \
{ \ { \
GType type = \ GType type = \
g_boxed_type_register_static (g_intern_static_string (I_("Cogl" # Name)), \ g_boxed_type_register_static (g_intern_static_string (I_("Cogl" # Name)), \
(GBoxedCopyFunc)copy_func, \ (GBoxedCopyFunc)copy_func, \
(GBoxedFreeFunc)free_func); \ (GBoxedFreeFunc)free_func); \
g_once_init_leave (&type_volatile, type); \ g_once_init_leave (&g_type_id, type); \
} \ } \
return type_volatile; \ return g_type_id; \
} }
#define COGL_GTYPE_IMPLEMENT_INTERFACE(name) { \ #define COGL_GTYPE_IMPLEMENT_INTERFACE(name) { \
@ -89,8 +89,8 @@ cogl_##underscore_name##_get_gtype (void) \
GType \ GType \
cogl_##name##_get_gtype (void) \ cogl_##name##_get_gtype (void) \
{ \ { \
static volatile gsize type_id__volatile = 0; \ static size_t g_type_id = 0; \
if (g_once_init_enter (&type_id__volatile)) \ if (g_once_init_enter (&g_type_id)) \
{ \ { \
static const GTypeFundamentalInfo finfo = { \ static const GTypeFundamentalInfo finfo = { \
(G_TYPE_FLAG_CLASSED | \ (G_TYPE_FLAG_CLASSED | \
@ -125,12 +125,12 @@ cogl_##name##_get_gtype (void) \
I_("Cogl" # Name), \ I_("Cogl" # Name), \
&node_info, &finfo, \ &node_info, &finfo, \
G_TYPE_FLAG_ABSTRACT); \ G_TYPE_FLAG_ABSTRACT); \
g_once_init_leave (&type_id__volatile, \ g_once_init_leave (&g_type_id, \
fundamental_type_id); fundamental_type_id);
#define _COGL_GTYPE_DEFINE_BASE_CLASS_END() \ #define _COGL_GTYPE_DEFINE_BASE_CLASS_END() \
} \ } \
return type_id__volatile; \ return g_type_id; \
} }
#define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,...) \ #define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,...) \
@ -144,8 +144,8 @@ cogl_##name##_get_gtype (void) \
GType \ GType \
name##_get_gtype (void) \ name##_get_gtype (void) \
{ \ { \
static volatile gsize type_id__volatile = 0; \ static size_t g_type_id = 0; \
if (g_once_init_enter (&type_id__volatile)) \ if (g_once_init_enter (&g_type_id)) \
{ \ { \
GType fundamental_type_id = \ GType fundamental_type_id = \
g_type_register_static_simple (G_TYPE_INTERFACE, \ g_type_register_static_simple (G_TYPE_INTERFACE, \
@ -162,10 +162,10 @@ cogl_##name##_get_gtype (void) \
#define _COGL_GTYPE_DEFINE_INTERFACE_EXTENDED_END() \ #define _COGL_GTYPE_DEFINE_INTERFACE_EXTENDED_END() \
/* following custom code */ \ /* following custom code */ \
} \ } \
g_once_init_leave (&type_id__volatile, \ g_once_init_leave (&g_type_id, \
fundamental_type_id); \ fundamental_type_id); \
} \ } \
return type_id__volatile; \ return g_type_id; \
} /* closes name##_get_type() */ } /* closes name##_get_type() */
@ -207,8 +207,8 @@ cogl_##name##_get_gtype (void) \
GType \ GType \
name##_get_gtype (void) \ name##_get_gtype (void) \
{ \ { \
static volatile gsize type_id__volatile = 0; \ static size_t g_type_id = 0; \
if (g_once_init_enter (&type_id__volatile)) \ if (g_once_init_enter (&g_type_id)) \
{ \ { \
GType fundamental_type_id = \ GType fundamental_type_id = \
g_type_register_static_simple (parent, \ g_type_register_static_simple (parent, \
@ -223,10 +223,10 @@ cogl_##name##_get_gtype (void) \
#define _COGL_GTYPE_DEFINE_TYPE_EXTENDED_END() \ #define _COGL_GTYPE_DEFINE_TYPE_EXTENDED_END() \
/* following custom code */ \ /* following custom code */ \
} \ } \
g_once_init_leave (&type_id__volatile, \ g_once_init_leave (&g_type_id, \
fundamental_type_id); \ fundamental_type_id); \
} \ } \
return type_id__volatile; \ return g_type_id; \
} /* closes name##_get_type() */ } /* closes name##_get_type() */