Conflicts:
	src/server/game/Server/WorldSocket.h
This commit is contained in:
Shauren committed 2014-09-12 20:27:46 +02:00
commit de4aea093b
5 files changed
+10 -5

No files matched your search

+1 -1
View File
@@ -81,7 +81,7 @@ public:
}
}
void Write(void* data, std::size_t size)
void Write(void const* data, std::size_t size)
{
if (size)
{
+2 -1
View File
@@ -111,11 +111,12 @@ public:
void QueuePacket(MessageBuffer&& buffer, std::unique_lock<std::mutex>& guard)
{
_writeQueue.push(std::move(buffer));
#ifdef BOOST_ASIO_HAS_IOCP
AsyncProcessQueue(guard);
#else
(void)guard;
#endif
}