From 91a0fbbd7145d6fb966231689c369d641da06f9b Mon Sep 17 00:00:00 2001 From: Ujp8LfXBJ6wCPR Date: Sat, 8 Feb 2020 20:29:18 +0100 Subject: Use boost::optional and boost::none instead of smelly pointer (#24134) * Remove bad pointer usage from CharacterCache Use TrinityCore Option type instead which is intended for this purpose. (Wrapper around boost::option until C++17 bump is finalised) * Unify codestyle regarding TC optional type Based upon advice from @Shauren (cherry picked from commit 76831f1f467efe4aa26a38dc58c9eab2229bce71) --- src/server/game/Scripting/ScriptReloadMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Scripting/ScriptReloadMgr.cpp') diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index 7a44b9432cd..47275a2d74d 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -278,7 +278,7 @@ Optional> path.generic_string().c_str()); } - return boost::none; + return {}; } // Use RAII to release the library on failure. @@ -305,7 +305,7 @@ Optional> TC_LOG_ERROR("scripts.hotswap", "Could not extract all required functions from the shared library \"%s\"!", path.generic_string().c_str()); - return boost::none; + return {}; } } -- cgit v1.2.3