Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Server/Database: Reduce differences between 3.3.5 and 6.x branches

Browse Source 
Code functionality shouldn't have been modified.
This commit is contained in:
jackpoz
2016-08-10 16:57:21 +02:00
parent abe37e458c
commit 7616f796d0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/database/Database/QueryCallback.h
View File

@@ -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;
}

2
src/server/database/Database/QueryHolder.h
View File

@@ -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)