| Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 1 | From 46bae4f18dfec8fedda82648091752d270b2dff8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Philip Withnall <pwithnall@endlessos.org> |
| 3 | Date: Wed, 11 Nov 2020 19:19:20 +0000 |
| 4 | Subject: [PATCH 19/29] gatomicarray: Drop volatile qualifier from GAtomicArray |
| 5 | API |
| 6 | |
| 7 | This is an API break, but it should not affect third party code since |
| 8 | that code should not be interacting with the `data` member in a way that |
| 9 | invokes its `volatile` qualifier (such as copying to an intermediate |
| 10 | variable). |
| 11 | |
| 12 | Signed-off-by: Philip Withnall <pwithnall@endlessos.org> |
| 13 | |
| 14 | Helps: #600 |
| 15 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719] |
| 16 | --- |
| 17 | gobject/gatomicarray.h | 4 ++-- |
| 18 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/gobject/gatomicarray.h b/gobject/gatomicarray.h |
| 21 | index 9550fa396..89043c5e4 100644 |
| 22 | --- a/gobject/gatomicarray.h |
| 23 | +++ b/gobject/gatomicarray.h |
| 24 | @@ -29,7 +29,7 @@ G_BEGIN_DECLS |
| 25 | |
| 26 | typedef struct _GAtomicArray GAtomicArray; |
| 27 | struct _GAtomicArray { |
| 28 | - volatile gpointer data; /* elements - atomic */ |
| 29 | + gpointer data; /* elements - atomic */ |
| 30 | }; |
| 31 | |
| 32 | void _g_atomic_array_init (GAtomicArray *array); |
| 33 | @@ -42,7 +42,7 @@ void _g_atomic_array_update (GAtomicArray *array, |
| 34 | #define G_ATOMIC_ARRAY_GET_LOCKED(_array, _type) ((_type *)((_array)->data)) |
| 35 | |
| 36 | #define G_ATOMIC_ARRAY_DO_TRANSACTION(_array, _type, _C_) G_STMT_START { \ |
| 37 | - volatile gpointer *_datap = &(_array)->data; \ |
| 38 | + gpointer *_datap = &(_array)->data; \ |
| 39 | _type *transaction_data, *__check; \ |
| 40 | \ |
| 41 | __check = g_atomic_pointer_get (_datap); \ |
| 42 | -- |
| 43 | 2.30.1 |
| 44 | |