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/Cache/CharacterCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Cache/CharacterCache.cpp') diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp index aea05434410..fa55d2a8235 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -117,7 +117,7 @@ void CharacterCache::DeleteCharacterCacheEntry(ObjectGuid const& guid, std::stri _characterCacheByNameStore.erase(name); } -void CharacterCache::UpdateCharacterData(ObjectGuid const& guid, std::string const& name, uint8* gender /*= nullptr*/, uint8* race /*= nullptr*/) +void CharacterCache::UpdateCharacterData(ObjectGuid const& guid, std::string const& name, Optional gender /*= {}*/, Optional race /*= {}*/) { auto itr = _characterCacheStore.find(guid); if (itr == _characterCacheStore.end()) -- cgit v1.2.3