diff options
author | Shauren <shauren.trinity@gmail.com> | 2014-07-19 17:03:32 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2014-07-19 17:03:32 +0200 |
commit | 0bcc92d90020d0c4f7d3086189cc94e4990517b1 (patch) | |
tree | 52453e9b1ed9efe2edca7c61ee771cc8d30a29a4 /src/server/authserver/Main.cpp | |
parent | 2452cfb98ecdc18bd64a118410d2a6dc9505f0c4 (diff) |
Part 3: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/authserver/Main.cpp')
-rw-r--r-- | src/server/authserver/Main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 732ed58a19c..9fe6fb276a8 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -33,6 +33,8 @@ #include "AsyncAcceptor.h" #include "AuthSession.h" +#include "BattlenetManager.h" +#include "BattlenetSession.h" #include "Common.h" #include "Configuration/Config.h" #include "Database/DatabaseEnv.h" @@ -117,7 +119,7 @@ int main(int argc, char** argv) std::string bindIp = sConfigMgr->GetStringDefault("BindIP", "0.0.0.0"); AsyncAcceptor<AuthSession> authServer(_ioService, bindIp, port); - AsyncAcceptor<Battlenet::Socket> bnetServer(_ioService, bindIp, 1119); + AsyncAcceptor<Battlenet::Session> bnetServer(_ioService, bindIp, 1119); // Set signal handlers boost::asio::signal_set signals(_ioService, SIGINT, SIGTERM); |