From 03176662d10d6068df035b355eb4c47ddd4e1dde Mon Sep 17 00:00:00 2001
From: Carbenium <keresztesschmidt@gmail.com>
Date: Wed, 18 Mar 2015 02:59:40 +0100
Subject: 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
---
 src/server/game/Server/WorldSocketMgr.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/server/game/Server')

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);
-- 
cgit v1.2.3