From b7aef385e863072eef544dcfcc033090a882ff8f Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 17 Feb 2018 23:26:50 +0100 Subject: Core/Misc: ASSERT() cleanup Move some functions calls out of ASSERT() calls. ASSERT() should only apply checks without modifying any object and without having any side effect. (cherry picked from commit 572eab1c355d9298ee640ebd7439f55366224fb8) --- src/server/game/Tools/PlayerDump.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/server/game/Tools') diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index c4139c435df..c176c831820 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -197,10 +197,12 @@ std::vector CharacterTables; inline bool StringsEqualCaseInsensitive(std::string const& left, std::string const& right) { std::string upperLeftString = left; - ASSERT(Utf8ToUpperOnlyLatin(upperLeftString)); + bool leftResult = Utf8ToUpperOnlyLatin(upperLeftString); + ASSERT(leftResult); std::string upperRightString = right; - ASSERT(Utf8ToUpperOnlyLatin(upperRightString)); + bool rightResult = Utf8ToUpperOnlyLatin(upperRightString); + ASSERT(rightResult); return upperLeftString == upperRightString; } @@ -301,7 +303,8 @@ void PlayerDump::InitializeTables() f.FieldName = columnName; f.IsBinaryField = !boost::ifind_first(typeName, "binary").empty() || !boost::ifind_first(typeName, "blob").empty(); - ASSERT(Utf8ToUpperOnlyLatin(columnName)); + bool toUpperResult = Utf8ToUpperOnlyLatin(columnName); + ASSERT(toUpperResult); t.TableFields.emplace_back(std::move(f)); } while (result->NextRow()); -- cgit v1.2.3