From 1ed1ce9506e65f76fe5236194516f23d662bba0b Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Sun, 5 May 2024 17:16:00 +0100 Subject: internal: new shared_ptr and weak_ptr implementation (#5883) moves std::shared_ptrs to a new implementation Advantages: - you can dereference a weak_ptr directly. This will obviously segfault on a nullptr deref if it's expired. - this is useful to avoid the .lock() hell where we are 100% sure the pointer _should_ be valid. (and if it isn't, it should throw.) - weak_ptrs are still valid while the SP is being destroyed. - reasoning: while an object (e.g. CWindow) is being destroyed, its `weak_ptr self` should be accessible (the sp is still alive, and so is CWindow), but it's not because by stl it's already expired (to prevent resurrection) - this impl solves it differently. w_p is expired, but can still be dereferenced and used. Creating `s_p`s is not possible anymore, though. - this is useful in destructors and callbacks. --- src/managers/TokenManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/managers/TokenManager.cpp') diff --git a/src/managers/TokenManager.cpp b/src/managers/TokenManager.cpp index 89db3256..451baac1 100644 --- a/src/managers/TokenManager.cpp +++ b/src/managers/TokenManager.cpp @@ -26,11 +26,11 @@ std::string CTokenManager::getRandomUUID() { std::string CTokenManager::registerNewToken(std::any data, std::chrono::system_clock::duration expires) { std::string uuid = getRandomUUID(); - m_mTokens[uuid] = std::make_shared(uuid, data, expires); + m_mTokens[uuid] = makeShared(uuid, data, expires); return uuid; } -std::shared_ptr CTokenManager::getToken(const std::string& uuid) { +SP CTokenManager::getToken(const std::string& uuid) { // cleanup expired tokens const auto NOW = std::chrono::system_clock::now(); @@ -42,7 +42,7 @@ std::shared_ptr CTokenManager::getToken(const std::string& uuid) { return m_mTokens.at(uuid); } -void CTokenManager::removeToken(std::shared_ptr token) { +void CTokenManager::removeToken(SP token) { if (!token) return; m_mTokens.erase(token->uuid); -- cgit v1.2.3