Skip to content

Commit 6dc82fc

Browse files
authored
Merge pull request #14753 from tymoteuszblochmobica/atomic
Add mbed prefix into atomic
2 parents e377383 + 3a05db8 commit 6dc82fc

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

platform/cxxsupport/mstd_atomic

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,27 +186,27 @@ struct AtomicBaseRaw {
186186
T val;
187187
} ret;
188188
{
189-
CriticalSectionLock lock;
189+
mbed::CriticalSectionLock lock;
190190
memcpy(std::addressof(ret.val), const_cast<const T *>(std::addressof(data)), sizeof(T));
191191
}
192192
return std::move(ret.val);
193193
}
194194
T load(memory_order order = memory_order_seq_cst) const noexcept
195195
{
196196
MBED_CHECK_LOAD_ORDER(order);
197-
CriticalSectionLock lock;
197+
mbed::CriticalSectionLock lock;
198198
return data;
199199
}
200200
void store(T desired, memory_order order = memory_order_seq_cst) volatile noexcept
201201
{
202202
MBED_CHECK_STORE_ORDER(order);
203-
CriticalSectionLock lock;
203+
mbed::CriticalSectionLock lock;
204204
memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T));
205205
}
206206
void store(T desired, memory_order order = memory_order_seq_cst) noexcept
207207
{
208208
MBED_CHECK_STORE_ORDER(order);
209-
CriticalSectionLock lock;
209+
mbed::CriticalSectionLock lock;
210210
data = std::move(desired); // MoveAssignable
211211
}
212212
T exchange(T desired, memory_order = memory_order_seq_cst) volatile noexcept
@@ -217,23 +217,23 @@ struct AtomicBaseRaw {
217217
T val;
218218
} old;
219219
{
220-
CriticalSectionLock lock;
220+
mbed::CriticalSectionLock lock;
221221
memcpy(std::addressof(old.val), const_cast<const T *>(std::addressof(data)), sizeof(T));
222222
memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T));
223223
}
224224
return old.val;
225225
}
226226
T exchange(T desired, memory_order = memory_order_seq_cst) noexcept
227227
{
228-
CriticalSectionLock lock;
228+
mbed::CriticalSectionLock lock;
229229
T old = std::move(data); // MoveConstructible
230230
data = std::move(desired); // MoveAssignable
231231
return old;
232232
}
233233
bool compare_exchange_strong(T &expected, T desired, memory_order success, memory_order failure) volatile noexcept
234234
{
235235
MBED_CHECK_CAS_ORDER(success, failure);
236-
CriticalSectionLock lock;
236+
mbed::CriticalSectionLock lock;
237237
if (memcmp(const_cast<const T *>(std::addressof(data)), std::addressof(expected), sizeof(T)) == 0) {
238238
memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T));
239239
return true;
@@ -245,7 +245,7 @@ struct AtomicBaseRaw {
245245
bool compare_exchange_strong(T &expected, T desired, memory_order success, memory_order failure) noexcept
246246
{
247247
MBED_CHECK_CAS_ORDER(success, failure);
248-
CriticalSectionLock lock;
248+
mbed::CriticalSectionLock lock;
249249
if (memcmp(std::addressof(data), std::addressof(expected), sizeof(T)) == 0) {
250250
data = std::move(desired); // MoveAssignable
251251
return true;

0 commit comments

Comments
 (0)