aboutsummaryrefslogtreecommitdiff
path: root/src/server/database/Database
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-04-22 13:45:23 +0200
committerDDuarte <dnpd.dd@gmail.com>2016-04-28 16:21:20 +0100
commit40b0f03d5c56cc8a4c81b9512e5bfd333da83fab (patch)
tree1dd6bbd93762611c33a108804657c2169a1357ea /src/server/database/Database
parentb82ffb88f7e6342f6abcb09b789ad5c46efe158c (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/server/database/Database')
-rw-r--r--src/server/database/Database/DatabaseWorkerPool.h4
1 files changed, 2 insertions, 2 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());