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

Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h

1 files changed, 9 insertions, 5 deletions

diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h
index 45a1cbc692a..1fee1d0685f 100644
--- a/src/server/shared/Threading/ProducerConsumerQueue.h
+++ b/src/server/shared/Threading/ProducerConsumerQueue.h
@@ -22,12 +22,11 @@
 #include <mutex>
 #include <queue>
 #include <atomic>
+#include <type_traits>
 
 template <typename T>
 class ProducerConsumerQueue
 {
-    static_assert(std::is_pointer<T>::value, "T for ProducerConsumerQueue must be a pointer");
-
 private:
     std::mutex _queueLock;
     std::queue<T> _queue;
@@ -94,7 +93,7 @@ public:
         {
             T& value = _queue.front();
 
-            delete value;
+            DeleteQueuedObject(value);
 
             _queue.pop();
         }
@@ -105,8 +104,13 @@ public:
 
         _condition.notify_all();
     }
-};
 
-#endif
+private:
+    template<typename E = T>
+    typename std::enable_if<std::is_pointer<E>::value>::type DeleteQueuedObject(E& obj) { delete obj; }
 
+    template<typename E = T>
+    typename std::enable_if<!std::is_pointer<E>::value>::type DeleteQueuedObject(E const& /*packet*/) { }
+};
 
+#endif