aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2016-08-10 16:57:21 +0200
committerjackpoz <giacomopoz@gmail.com>2016-08-10 16:57:21 +0200
commit7616f796d0fa6a82935cfc67bfdfbcf54efbcbc7 (patch)
tree7f21722732cc10e8ebd7b39983f4ae5971fd8e03
parentabe37e458c2b482d478ce98ba44bc8dcf76caeb1 (diff)
Server/Database: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
-rw-r--r--src/server/database/Database/QueryCallback.h4
-rw-r--r--src/server/database/Database/QueryHolder.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h
index 5f6ae74da4f..87e5f96ed1b 100644
--- a/src/server/database/Database/QueryCallback.h
+++ b/src/server/database/Database/QueryCallback.h
@@ -45,7 +45,7 @@ class QueryCallback
return _result;
}
- int IsReady()
+ bool IsReady()
{
return _result.valid() && _result.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
}
@@ -128,7 +128,7 @@ class QueryCallback_2
return _result;
}
- int IsReady()
+ bool IsReady()
{
return _result.valid() && _result.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
}
diff --git a/src/server/database/Database/QueryHolder.h b/src/server/database/Database/QueryHolder.h
index 2446a4db2bd..34887767dea 100644
--- a/src/server/database/Database/QueryHolder.h
+++ b/src/server/database/Database/QueryHolder.h
@@ -28,7 +28,7 @@ class TC_DATABASE_API SQLQueryHolder
std::vector<SQLResultPair> m_queries;
public:
SQLQueryHolder() { }
- ~SQLQueryHolder();
+ virtual ~SQLQueryHolder();
bool SetQuery(size_t index, const char* sql);
template<typename Format, typename... Args>
bool SetPQuery(size_t index, Format&& sql, Args&&... args)