Skip to content

Commit 3cd7330

Browse files
committed
*: Backport changes from master
1 parent 7cc1489 commit 3cd7330

File tree

21 files changed

+445
-455
lines changed

21 files changed

+445
-455
lines changed

mcfgthread/atomic.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ __MCF_C_DECLARATIONS_BEGIN
102102
#define __MCF_atomic_load_(WIDTH, ORDER, INTEGER) \
103103
__MCF_ALWAYS_INLINE \
104104
INTEGER \
105-
_MCF_atomic_load_##WIDTH##_##ORDER(__MCF_zp_r __mem) __MCF_NOEXCEPT \
105+
_MCF_atomic_load_##WIDTH##_##ORDER(__MCF_zp_r __mem) __MCF_noexcept \
106106
{ \
107107
return __MCF_atomic_load((const __MCF_atomic(INTEGER)*) __mem, \
108108
__MCF_memory_order_##ORDER); \
109109
} \
110110
\
111111
__MCF_ALWAYS_INLINE \
112112
void \
113-
_MCF_atomic_load_p##WIDTH##_##ORDER(__MCF_zp __res, __MCF_zp_r __mem) __MCF_NOEXCEPT \
113+
_MCF_atomic_load_p##WIDTH##_##ORDER(__MCF_zp __res, __MCF_zp_r __mem) __MCF_noexcept \
114114
{ \
115115
*(INTEGER*) __res = __MCF_atomic_load((const __MCF_atomic(INTEGER)*) __mem, \
116116
__MCF_memory_order_##ORDER); \
@@ -153,15 +153,15 @@ __MCF_atomic_load_(z, cst, size_t)
153153
#define __MCF_atomic_store_(WIDTH, ORDER, INTEGER) \
154154
__MCF_ALWAYS_INLINE \
155155
void \
156-
_MCF_atomic_store_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_NOEXCEPT \
156+
_MCF_atomic_store_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_noexcept \
157157
{ \
158158
__MCF_atomic_store((__MCF_atomic(INTEGER)*) __mem, __val, \
159159
__MCF_memory_order_##ORDER); \
160160
} \
161161
\
162162
__MCF_ALWAYS_INLINE \
163163
void \
164-
_MCF_atomic_store_p##WIDTH##_##ORDER(__MCF_zp __mem, __MCF_zp_r __src) __MCF_NOEXCEPT \
164+
_MCF_atomic_store_p##WIDTH##_##ORDER(__MCF_zp __mem, __MCF_zp_r __src) __MCF_noexcept \
165165
{ \
166166
__MCF_atomic_store((__MCF_atomic(INTEGER)*) __mem, *(const INTEGER*) __src, \
167167
__MCF_memory_order_##ORDER); \
@@ -205,15 +205,15 @@ __MCF_atomic_store_(z, cst, size_t)
205205
#define __MCF_atomic_xchg_(WIDTH, ORDER, INTEGER) \
206206
__MCF_ALWAYS_INLINE \
207207
INTEGER \
208-
_MCF_atomic_xchg_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_NOEXCEPT \
208+
_MCF_atomic_xchg_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_noexcept \
209209
{ \
210210
return __MCF_atomic_xchg((__MCF_atomic(INTEGER)*) __mem, __val, \
211211
__MCF_memory_order_##ORDER); \
212212
} \
213213
\
214214
__MCF_ALWAYS_INLINE \
215215
void \
216-
_MCF_atomic_xchg_p##WIDTH##_##ORDER(__MCF_zp __res, __MCF_zp __mem, __MCF_zp_r __src) __MCF_NOEXCEPT \
216+
_MCF_atomic_xchg_p##WIDTH##_##ORDER(__MCF_zp __res, __MCF_zp __mem, __MCF_zp_r __src) __MCF_noexcept \
217217
{ \
218218
*(INTEGER*) __res = __MCF_atomic_xchg((__MCF_atomic(INTEGER)*) __mem, \
219219
*(const INTEGER*) __src, __MCF_memory_order_##ORDER); \
@@ -271,7 +271,7 @@ __MCF_atomic_xchg_(z, cst, size_t)
271271
#define __MCF_atomic_cmpxchg_(WIDTH, ORDER, INTEGER) \
272272
__MCF_ALWAYS_INLINE \
273273
bool \
274-
_MCF_atomic_cmpxchg_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER* __restrict __cmp, INTEGER __val) __MCF_NOEXCEPT \
274+
_MCF_atomic_cmpxchg_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER* __restrict __cmp, INTEGER __val) __MCF_noexcept \
275275
{ \
276276
return __MCF_atomic_cmpxchg((__MCF_atomic(INTEGER)*) __mem, __cmp, \
277277
__val, __MCF_memory_order_##ORDER, \
@@ -280,7 +280,7 @@ __MCF_atomic_xchg_(z, cst, size_t)
280280
\
281281
__MCF_ALWAYS_INLINE \
282282
bool \
283-
_MCF_atomic_cmpxchg_p##WIDTH##_##ORDER(__MCF_zp __mem, __MCF_zp __cmp, __MCF_zp __val) __MCF_NOEXCEPT \
283+
_MCF_atomic_cmpxchg_p##WIDTH##_##ORDER(__MCF_zp __mem, __MCF_zp __cmp, __MCF_zp __val) __MCF_noexcept \
284284
{ \
285285
return __MCF_atomic_cmpxchg((__MCF_atomic(INTEGER)*) __mem, (INTEGER*) __cmp, \
286286
*(const INTEGER*) __val, __MCF_memory_order_##ORDER, \
@@ -339,7 +339,7 @@ __MCF_atomic_cmpxchg_(z, cst, size_t)
339339
#define __MCF_atomic_cmpxchg_weak_(WIDTH, ORDER, INTEGER) \
340340
__MCF_ALWAYS_INLINE \
341341
bool \
342-
_MCF_atomic_cmpxchg_weak_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER* __restrict __cmp, INTEGER __val) __MCF_NOEXCEPT \
342+
_MCF_atomic_cmpxchg_weak_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER* __restrict __cmp, INTEGER __val) __MCF_noexcept \
343343
{ \
344344
return __MCF_atomic_cmpxchgw((__MCF_atomic(INTEGER)*) __mem, __cmp, \
345345
__val, __MCF_memory_order_##ORDER, \
@@ -348,7 +348,7 @@ __MCF_atomic_cmpxchg_(z, cst, size_t)
348348
\
349349
__MCF_ALWAYS_INLINE \
350350
bool \
351-
_MCF_atomic_cmpxchg_weak_p##WIDTH##_##ORDER(__MCF_zp __mem, __MCF_zp __cmp, __MCF_zp __val) __MCF_NOEXCEPT \
351+
_MCF_atomic_cmpxchg_weak_p##WIDTH##_##ORDER(__MCF_zp __mem, __MCF_zp __cmp, __MCF_zp __val) __MCF_noexcept \
352352
{ \
353353
return __MCF_atomic_cmpxchgw((__MCF_atomic(INTEGER)*) __mem, (INTEGER*) __cmp, \
354354
*(const INTEGER*) __val, __MCF_memory_order_##ORDER, \
@@ -400,7 +400,7 @@ __MCF_atomic_cmpxchg_weak_(z, cst, size_t)
400400
#define __MCF_atomic_xadd_(WIDTH, ORDER, INTEGER) \
401401
__MCF_ALWAYS_INLINE \
402402
INTEGER \
403-
_MCF_atomic_xadd_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_NOEXCEPT \
403+
_MCF_atomic_xadd_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_noexcept \
404404
{ \
405405
return __MCF_atomic_xadd((__MCF_atomic(INTEGER)*) __mem, __val, \
406406
__MCF_memory_order_##ORDER); \
@@ -451,7 +451,7 @@ __MCF_atomic_xadd_(z, cst, size_t)
451451
#define __MCF_atomic_xsub_(WIDTH, ORDER, INTEGER) \
452452
__MCF_ALWAYS_INLINE \
453453
INTEGER \
454-
_MCF_atomic_xsub_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_NOEXCEPT \
454+
_MCF_atomic_xsub_##WIDTH##_##ORDER(__MCF_zp __mem, INTEGER __val) __MCF_noexcept \
455455
{ \
456456
return __MCF_atomic_xsub((__MCF_atomic(INTEGER)*) __mem, __val, \
457457
__MCF_memory_order_##ORDER); \
@@ -501,7 +501,7 @@ __MCF_atomic_xsub_(z, cst, size_t)
501501
#define __MCF_atomic_thread_fence_(ORDER) \
502502
__MCF_ALWAYS_INLINE \
503503
void \
504-
_MCF_thread_fence_##ORDER(void) __MCF_NOEXCEPT \
504+
_MCF_thread_fence_##ORDER(void) __MCF_noexcept \
505505
{ \
506506
__MCF_atomic_thread_fence(__MCF_memory_order_##ORDER); \
507507
}
@@ -520,7 +520,7 @@ __MCF_atomic_thread_fence_(cst)
520520
#define __MCF_atomic_signal_fence_(ORDER) \
521521
__MCF_ALWAYS_INLINE \
522522
void \
523-
_MCF_signal_fence_##ORDER(void) __MCF_NOEXCEPT \
523+
_MCF_signal_fence_##ORDER(void) __MCF_noexcept \
524524
{ \
525525
__MCF_atomic_signal_fence(__MCF_memory_order_##ORDER); \
526526
}

0 commit comments

Comments
 (0)