aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Networking
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-09-16 21:09:19 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-09-16 21:09:19 +0200
commit7cbaa028cd3192725ed47226c08fb3e6f82f02d3 (patch)
tree79aea5cded1f950d48df2d24f4ec82cab59f5e7c /src/server/shared/Networking
parent037ce92c172342fd54f4eb3808cdb8813d9bdce0 (diff)
parent6810a4469ebe6600be2f8649e917110a17ce27f3 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/shared/Networking')
-rw-r--r--src/server/shared/Networking/Socket.h2
-rw-r--r--src/server/shared/Networking/SocketMgr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index d1f143aeb1e..dfff60a380b 100644
--- a/src/server/shared/Networking/Socket.h
+++ b/src/server/shared/Networking/Socket.h
@@ -148,7 +148,7 @@ protected:
return true;
_isWritingAsync = true;
-
+
#ifdef BOOST_ASIO_HAS_IOCP
MessageBuffer& buffer = _writeQueue.front();
_socket.async_write_some(boost::asio::buffer(buffer.GetReadPointer(), buffer.GetActiveSize()), std::bind(&Socket<T>::WriteHandler,
diff --git a/src/server/shared/Networking/SocketMgr.h b/src/server/shared/Networking/SocketMgr.h
index 47bd7794a4c..dbe2b8ec902 100644
--- a/src/server/shared/Networking/SocketMgr.h
+++ b/src/server/shared/Networking/SocketMgr.h
@@ -97,7 +97,7 @@ public:
int32 GetNetworkThreadCount() const { return _threadCount; }
protected:
- SocketMgr() : _threads(nullptr), _threadCount(1)
+ SocketMgr() : _acceptor(nullptr), _threads(nullptr), _threadCount(1)
{
}