aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorCarbenium <keresztesschmidt@gmail.com>2015-03-18 02:59:40 +0100
committerCarbenium <keresztesschmidt@gmail.com>2015-03-18 02:59:40 +0100
commit03176662d10d6068df035b355eb4c47ddd4e1dde (patch)
tree71137697bad6bbc4b21259808ddde5739ae0025a /src/server/game/Server
parent301ec0be564a4f160984dc5e34ab5468464dc76e (diff)
Merge pull request #14317 from Naios/typesafelog
Type safe logging (cherry picked from commit cc0c9add5a3f3a17e19029ddcaa7e711040f4fc5) Conflicts: src/server/bnetserver/CMakeLists.txt src/server/game/Server/WorldSocketMgr.cpp src/server/shared/Logging/AppenderDB.cpp src/server/worldserver/CMakeLists.txt
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/WorldSocketMgr.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 947bd62860c..e83d39cb922 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -46,6 +46,8 @@ WorldSocketMgr::WorldSocketMgr() : BaseSocketMgr(), _socketSendBufferSize(-1), m
{
}
+int const boost::asio::socket_base::max_connections;
+
bool WorldSocketMgr::StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port)
{
_tcpNoDelay = sConfigMgr->GetBoolDefault("Network.TcpNodelay", true);