diff options
| author | Naios <naios-dev@live.de> | 2016-05-10 18:16:13 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-05-10 18:20:52 +0200 |
| commit | be90932edab39fa0097ce4146f6886bd648aca02 (patch) | |
| tree | 56c7f1a92a7038b89ad5d87d8f6a902d6857a8ad | |
| parent | 9fa5906c40a64ba74a96a692e51cfba979685671 (diff) | |
Core/Common: Move the query callback header to the database project
* Also renames the header to it's correct name QueryCallback
(cherry picked from commit d4d199d7654a95c53c77e30e6bd9203ee70b9373)
| -rw-r--r-- | src/server/bnetserver/Server/Session.h | 2 | ||||
| -rw-r--r-- | src/server/database/Database/DatabaseWorkerPool.h | 2 | ||||
| -rw-r--r-- | src/server/database/Database/QueryCallback.h (renamed from src/common/Threading/Callback.h) | 6 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/bnetserver/Server/Session.h b/src/server/bnetserver/Server/Session.h index 4170cbc7826..c067d1c3d45 100644 --- a/src/server/bnetserver/Server/Session.h +++ b/src/server/bnetserver/Server/Session.h @@ -23,7 +23,7 @@ #include "SslSocket.h" #include "Socket.h" #include "BigNumber.h" -#include "Callback.h" +#include "QueryCallback.h" #include <boost/asio/ip/tcp.hpp> #include <boost/asio/ssl.hpp> #include <google/protobuf/message.h> diff --git a/src/server/database/Database/DatabaseWorkerPool.h b/src/server/database/Database/DatabaseWorkerPool.h index 59a42096c8e..ffdde91c0a6 100644 --- a/src/server/database/Database/DatabaseWorkerPool.h +++ b/src/server/database/Database/DatabaseWorkerPool.h @@ -19,7 +19,7 @@ #define _DATABASEWORKERPOOL_H #include "Common.h" -#include "Callback.h" +#include "QueryCallback.h" #include "MySQLConnection.h" #include "Transaction.h" #include "DatabaseWorker.h" diff --git a/src/common/Threading/Callback.h b/src/server/database/Database/QueryCallback.h index 38e1dcdff91..87e5f96ed1b 100644 --- a/src/common/Threading/Callback.h +++ b/src/server/database/Database/QueryCallback.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _CALLBACK_H -#define _CALLBACK_H +#ifndef _QUERY_CALLBACK_H +#define _QUERY_CALLBACK_H #include <future> #include "QueryResult.h" @@ -206,4 +206,4 @@ class QueryCallback_2 QueryCallback_2& operator=(QueryCallback_2 const& right) = delete; }; -#endif +#endif // _QUERY_CALLBACK_H diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index d93a64ec2b8..1cbcb747279 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -29,7 +29,7 @@ #include "Timer.h" #include "SharedDefines.h" #include "QueryResult.h" -#include "Callback.h" +#include "QueryCallback.h" #include "Realm/Realm.h" #include <atomic> |