From ed317aa18efe592c5b88b731403cd86bd1bfc7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= Date: Sat, 21 Dec 2024 00:00:00 +0000 Subject: [PATCH] [base] Fix warning about deprecated usage of `atomic_store` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following gcc warnings: ```` base/atomic_shared_ptr.hpp:19:52: warning: ‘void std::atomic_store(shared_ptr<_Tp>*, shared_ptr<_Tp>) [with _Tp = const editor::EditorConfig]’ is deprecated: use 'std::atomic>' instead [-Wdeprecated-declarations] 19 | void Set(ValueType value) noexcept { atomic_store(&m_wrapped, value); } | ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~ ```` Signed-off-by: Ferenc Géczi --- base/atomic_shared_ptr.hpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/base/atomic_shared_ptr.hpp b/base/atomic_shared_ptr.hpp index 3059f0dc09..d329aa6ae3 100644 --- a/base/atomic_shared_ptr.hpp +++ b/base/atomic_shared_ptr.hpp @@ -16,11 +16,26 @@ public: AtomicSharedPtr() = default; - void Set(ValueType value) noexcept { atomic_store(&m_wrapped, value); } - ValueType Get() const noexcept { return atomic_load(&m_wrapped); } +// TODO drop this condition and the else branch when Apple and Google will finally +// also support the full C++20 standard +// including the partial template specialization of `std::atomic` for `std::shared_ptr` +// mandated by `P0718R2`: +// https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0718r2.html#3.2 +// The support status can be also tracked at: +// https://en.cppreference.com/w/cpp/compiler_support/20#cpp_lib_atomic_shared_ptr_201711L +#if defined(_SHARED_PTR_ATOMIC_H) + void Set(ValueType value) noexcept { m_wrapped.store(value); } + ValueType Get() const noexcept { return m_wrapped.load(); } private: + std::atomic m_wrapped = std::make_shared(); +#else + void Set(ValueType value) noexcept { atomic_store(&m_wrapped, value); } + ValueType Get() const noexcept { return atomic_load(&m_wrapped); } + + private: ValueType m_wrapped = std::make_shared(); +#endif DISALLOW_COPY_AND_MOVE(AtomicSharedPtr); }; -- 2.45.3