From 4c27203c8f36dd2a5df0a4ae69fbdc4c9140b29d Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 13 Jan 2017 21:38:03 +0100 Subject: 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 --- src/server/game/Handlers/SocialHandler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/server/game/Handlers/SocialHandler.cpp') diff --git a/src/server/game/Handlers/SocialHandler.cpp b/src/server/game/Handlers/SocialHandler.cpp index cd9968bf84e..2b13cfdbd9b 100644 --- a/src/server/game/Handlers/SocialHandler.cpp +++ b/src/server/game/Handlers/SocialHandler.cpp @@ -18,6 +18,7 @@ #include "WorldSession.h" #include "Player.h" +#include "QueryCallback.h" #include "SocialMgr.h" #include "ObjectMgr.h" @@ -42,11 +43,11 @@ void WorldSession::HandleAddFriendOpcode(WorldPacket& recvData) PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUID_RACE_ACC_BY_NAME); stmt->setString(0, friendName); - _addFriendCallback.SetParam(friendNote); - _addFriendCallback.SetFutureResult(CharacterDatabase.AsyncQuery(stmt)); + _queryProcessor.AddQuery(CharacterDatabase.AsyncQuery(stmt) + .WithPreparedCallback(std::bind(&WorldSession::HandleAddFriendOpcodeCallback, this, std::move(friendNote), std::placeholders::_1))); } -void WorldSession::HandleAddFriendOpcodeCallback(PreparedQueryResult result, std::string const& friendNote) +void WorldSession::HandleAddFriendOpcodeCallback(std::string const& friendNote, PreparedQueryResult result) { if (!GetPlayer()) return; @@ -116,7 +117,7 @@ void WorldSession::HandleAddIgnoreOpcode(WorldPacket& recvData) PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_GUID_BY_NAME); stmt->setString(0, ignoreName); - _addIgnoreCallback = CharacterDatabase.AsyncQuery(stmt); + _queryProcessor.AddQuery(CharacterDatabase.AsyncQuery(stmt).WithPreparedCallback(std::bind(&WorldSession::HandleAddIgnoreOpcodeCallback, this, std::placeholders::_1))); } void WorldSession::HandleAddIgnoreOpcodeCallback(PreparedQueryResult result) -- cgit v1.2.3