AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'noexcept' of https://github.com/lioncash/urde

This commit is contained in:
Jack Andersen 2020-03-28 21:08:43 -10:00
parent 413483a996 764dac0adc
commit eefb975f23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/CToken.cpp
View File

@ -112,7 +112,7 @@ CToken& CToken::operator=(const CToken& other) {
} }
return *this; return *this;
} }
CToken& CToken::operator=(CToken&& other) { CToken& CToken::operator=(CToken&& other) noexcept {
Unlock(); Unlock();
RemoveRef(); RemoveRef();
x0_objRef = other.x0_objRef; x0_objRef = other.x0_objRef;

6
Runtime/CToken.hpp
View File

@ -84,7 +84,7 @@ public:
IObj* GetObj(); IObj* GetObj();
const IObj* GetObj() const { return const_cast<CToken*>(this)->GetObj(); } const IObj* GetObj() const { return const_cast<CToken*>(this)->GetObj(); }
CToken& operator=(const CToken& other); CToken& operator=(const CToken& other);
CToken& operator=(CToken&& other); CToken& operator=(CToken&& other) noexcept;
CToken() = default; CToken() = default;
CToken(const CToken& other); CToken(const CToken& other);
CToken(CToken&& other) noexcept; CToken(CToken&& other) noexcept;
@ -153,7 +153,7 @@ public:
m_obj = nullptr; m_obj = nullptr;
return *this; return *this;
} }
TCachedToken& operator=(const CToken& other) { TCachedToken& operator=(const CToken& other) override {
TToken<T>::operator=(other); TToken<T>::operator=(other);
m_obj = nullptr; m_obj = nullptr;
return *this; return *this;
@ -172,7 +172,7 @@ public:
return *this; return *this;
} }
TLockedToken(const CToken& other) : TCachedToken<T>(other) { CToken::Lock(); } TLockedToken(const CToken& other) : TCachedToken<T>(other) { CToken::Lock(); }
TLockedToken& operator=(const CToken& other) { TLockedToken& operator=(const CToken& other) override {
CToken oldTok = std::move(*this); CToken oldTok = std::move(*this);
TCachedToken<T>::operator=(other); TCachedToken<T>::operator=(other);
CToken::Lock(); CToken::Lock();