Merge branch 'deprecatedvolatile' into 'master'

Avoid C++20 deprecated assignment to volatile

See merge request GNOME/glib!1170
This commit is contained in:
Philip Withnall 2020-01-29 13:09:38 +00:00
commit 0d3d3e1d84

View File

@ -254,7 +254,7 @@ void g_once_init_leave (volatile void *location,
# define g_once_init_leave(location, result) \
(G_GNUC_EXTENSION ({ \
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)); \
}))
#else