diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/core/StarAtomicSharedPtr.hpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/core/StarAtomicSharedPtr.hpp')
-rw-r--r-- | source/core/StarAtomicSharedPtr.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/core/StarAtomicSharedPtr.hpp b/source/core/StarAtomicSharedPtr.hpp index e85ffd5..306192f 100644 --- a/source/core/StarAtomicSharedPtr.hpp +++ b/source/core/StarAtomicSharedPtr.hpp @@ -47,11 +47,11 @@ AtomicSharedPtr<T>::AtomicSharedPtr(AtomicSharedPtr const& p) template <typename T> AtomicSharedPtr<T>::AtomicSharedPtr(AtomicSharedPtr&& p) - : m_ptr(move(p.m_ptr)) {} + : m_ptr(std::move(p.m_ptr)) {} template <typename T> AtomicSharedPtr<T>::AtomicSharedPtr(SharedPtr p) - : m_ptr(move(p)) {} + : m_ptr(std::move(p)) {} template <typename T> auto AtomicSharedPtr<T>::load() const -> SharedPtr { @@ -68,7 +68,7 @@ auto AtomicSharedPtr<T>::weak() const -> WeakPtr { template <typename T> void AtomicSharedPtr<T>::store(SharedPtr p) { SpinLocker locker(m_lock); - m_ptr = move(p); + m_ptr = std::move(p); } template <typename T> @@ -105,14 +105,14 @@ AtomicSharedPtr<T>& AtomicSharedPtr<T>::operator=(AtomicSharedPtr const& p) { template <typename T> AtomicSharedPtr<T>& AtomicSharedPtr<T>::operator=(AtomicSharedPtr&& p) { SpinLocker locker(m_lock); - m_ptr = move(p.m_ptr); + m_ptr = std::move(p.m_ptr); return *this; } template <typename T> AtomicSharedPtr<T>& AtomicSharedPtr<T>::operator=(SharedPtr p) { SpinLocker locker(m_lock); - m_ptr = move(p); + m_ptr = std::move(p); return *this; } |