mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Merge branch 'deprecatedvolatile' into 'master'
Avoid C++20 deprecated assignment to volatile See merge request GNOME/glib!1170
This commit is contained in:
commit
0d3d3e1d84
@ -254,7 +254,7 @@ void g_once_init_leave (volatile void *location,
|
|||||||
# define g_once_init_leave(location, result) \
|
# define g_once_init_leave(location, result) \
|
||||||
(G_GNUC_EXTENSION ({ \
|
(G_GNUC_EXTENSION ({ \
|
||||||
G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer)); \
|
G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer)); \
|
||||||
(void) (0 ? *(location) = (result) : 0); \
|
0 ? (void) (*(location) = (result)) : (void) 0; \
|
||||||
g_once_init_leave ((location), (gsize) (result)); \
|
g_once_init_leave ((location), (gsize) (result)); \
|
||||||
}))
|
}))
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user