Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Server/WorldSocket.h

2 files changed, 3 insertions, 2 deletions

diff --git a/src/server/shared/Networking/MessageBuffer.h b/src/server/shared/Networking/MessageBuffer.h
index 2115bea3f47..2dcd4fbc161 100644
--- a/src/server/shared/Networking/MessageBuffer.h
+++ b/src/server/shared/Networking/MessageBuffer.h
@@ -81,7 +81,7 @@ public:
         }
     }
 
-    void Write(void* data, std::size_t size)
+    void Write(void const* data, std::size_t size)
     {
         if (size)
         {
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index 17f48343485..6aa7974b1c1 100644
--- a/src/server/shared/Networking/Socket.h
+++ b/src/server/shared/Networking/Socket.h
@@ -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
     }