Drop use of volatile
As detailed in gitlab.gnome.org/GNOME/glib/-/issues/600#note_877282, volatile isn't actually needed in these contexts because the atomic operations already give us strong enough guarantees. In GCC 11, this triggers a diagnostic due to the volatile qualifier getting dropped anyway. There is a WIP to do the same in glib: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 This obsoletes this downstream patch: https://src.fedoraproject.org/rpms/ostree/c/b8c5a6fb
This commit is contained in:
1 parent
64e09f46b8
commit
f895cf4fd2
6 files changed
+13
-13
No files matched your search
@@ -682,9 +682,9 @@ ostree_sysroot_upgrader_deploy (OstreeSysrootUpgrader *self,
|
||||
GType
|
||||
ostree_sysroot_upgrader_flags_get_type (void)
|
||||
{
|
||||
static volatile gsize g_define_type_id__volatile = 0;
|
||||
static gsize static_g_define_type_id = 0;
|
||||
|
||||
if (g_once_init_enter (&g_define_type_id__volatile))
|
||||
if (g_once_init_enter (&static_g_define_type_id))
|
||||
{
|
||||
static const GFlagsValue values[] = {
|
||||
{ OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED, "OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED", "ignore-unconfigured" },
|
||||
@@ -692,8 +692,8 @@ ostree_sysroot_upgrader_flags_get_type (void)
|
||||
};
|
||||
GType g_define_type_id =
|
||||
g_flags_register_static (g_intern_static_string ("OstreeSysrootUpgraderFlags"), values);
|
||||
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
|
||||
g_once_init_leave (&static_g_define_type_id, g_define_type_id);
|
||||
}
|
||||
|
||||
return g_define_type_id__volatile;
|
||||
return static_g_define_type_id;
|
||||
}
|
||||
Reference in new issue
Block a user