diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-22 13:45:23 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2016-04-28 16:21:20 +0100 |
| commit | 40b0f03d5c56cc8a4c81b9512e5bfd333da83fab (patch) | |
| tree | 1dd6bbd93762611c33a108804657c2169a1357ea /src | |
| parent | b82ffb88f7e6342f6abcb09b789ad5c46efe158c (diff) | |
Core/Misc: Fixed warnings found by GCC 6
(cherry picked from commit 67fd3ee726cbd509e6a15f81f4780e757a78a8b5)
# Conflicts:
# src/server/game/Spells/Auras/SpellAuras.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/database/Database/DatabaseWorkerPool.h | 4 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/database/Database/DatabaseWorkerPool.h b/src/server/database/Database/DatabaseWorkerPool.h index d883366237f..59a42096c8e 100644 --- a/src/server/database/Database/DatabaseWorkerPool.h +++ b/src/server/database/Database/DatabaseWorkerPool.h @@ -120,7 +120,7 @@ class DatabaseWorkerPool //! This method should only be used for queries that are only executed once, e.g during startup. void DirectExecute(const char* sql) { - if (!sql) + if (Trinity::IsFormatEmptyOrNull(sql)) return; T* connection = GetFreeConnection(); @@ -175,7 +175,7 @@ class DatabaseWorkerPool template<typename Format, typename... Args> QueryResult PQuery(Format&& sql, Args&&... args) { - if (!sql) + if (Trinity::IsFormatEmptyOrNull(sql)) return QueryResult(nullptr); return Query(Trinity::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str()); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index a8adda3ad58..92e60df0b04 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4686,7 +4686,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool case 71563: if (Aura* newAura = target->AddAura(71564, target)) newAura->SetStackAmount(newAura->GetSpellInfo()->StackAmount); - break; + break; } } // AT REMOVE |