diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-01-13 21:38:03 +0100 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-01-25 23:38:13 -0300 |
| commit | 4c27203c8f36dd2a5df0a4ae69fbdc4c9140b29d (patch) | |
| tree | 175c45945668243f86642b40cfadac92823f6c9f /src/server/authserver/Server/AuthSession.h | |
| parent | 8af3cccc83aa7fbda348a784e36f45331c091c9a (diff) | |
Core/DBLayer: Convert async queries to new query callbacks and remove old callback handling
(cherry picked from commit 8e2634b2b49eb814b8cc425a060b2f160dbb49b7)
Conflicts:
src/server/bnetserver/Server/Session.cpp
src/server/bnetserver/Server/Session.h
src/server/database/Database/QueryCallback.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/SocialHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/World/World.cpp
src/server/game/World/World.h
Diffstat (limited to 'src/server/authserver/Server/AuthSession.h')
| -rw-r--r-- | src/server/authserver/Server/AuthSession.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/authserver/Server/AuthSession.h b/src/server/authserver/Server/AuthSession.h index 1bc349dde4d..6b7124038e8 100644 --- a/src/server/authserver/Server/AuthSession.h +++ b/src/server/authserver/Server/AuthSession.h @@ -102,8 +102,7 @@ private: uint16 _build; uint8 _expversion; - PreparedQueryResultFuture _queryFuture; - std::function<void(PreparedQueryResult)> _queryCallback; + Optional<QueryCallback> _queryCallback; }; #pragma pack(push, 1) |