p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporarily revert AtomicSharedPtr upgrade.

This commit is contained in:
Marcel Pi 2024-03-12 15:06:28 +01:00
parent 6725e66d0d
commit c3118ed55a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibCarla/source/carla/AtomicSharedPtr.h
View File

@ -7,7 +7,6 @@
#pragma once
#include <memory>
#include <atomic>
namespace carla {
@ -26,7 +25,7 @@ namespace carla {
AtomicSharedPtr(AtomicSharedPtr &&) = delete;
void store(std::shared_ptr<T> ptr) noexcept {
_ptr.store(ptr, std::memory_order_release);
std::atomic_store_explicit(&_ptr, ptr, std::memory_order_release);
}
void reset(std::shared_ptr<T> ptr = nullptr) noexcept {
@ -34,12 +33,13 @@ namespace carla {
}
std::shared_ptr<T> load() const noexcept {
return _ptr.load(std::memory_order_acquire);
return std::atomic_load_explicit(&_ptr, std::memory_order_acquire);
}
bool compare_exchange(std::shared_ptr<T> *expected, std::shared_ptr<T> desired) noexcept {
return _ptr.compare_exchange_strong(
*expected,
return std::atomic_compare_exchange_strong_explicit(
&_ptr,
expected,
desired,
std::memory_order_acq_rel,
std::memory_order_acq_rel);
@ -59,7 +59,7 @@ namespace carla {
private:
std::atomic<std::shared_ptr<T>> _ptr;
std::shared_ptr<T> _ptr;
};
} // namespace carla