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

Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp

10 files changed, 28 insertions, 14 deletions

diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h
index 68daca5440f..42c3a700f3f 100644
--- a/src/server/shared/Configuration/Config.h
+++ b/src/server/shared/Configuration/Config.h
@@ -35,8 +35,8 @@ public:
 
     static ConfigMgr* instance()
     {
-        static ConfigMgr *instance = new ConfigMgr();
-        return instance;
+        static ConfigMgr instance;
+        return &instance;
     }
 
     bool Reload();
diff --git a/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp b/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
index 10403b84a1f..b9d9b86005c 100644
--- a/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
+++ b/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
@@ -20,6 +20,8 @@
 #include "Cryptography/HmacHash.h"
 #include "Cryptography/BigNumber.h"
 
+#include <cstring>
+
 WorldPacketCrypt::WorldPacketCrypt() : PacketCrypt(SHA_DIGEST_LENGTH)
 {
 }
diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 364bb8e452f..b68c91001ae 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -19,6 +19,7 @@
 #include "Cryptography/BigNumber.h"
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
+#include <cstring>
 #include <algorithm>
 #include <memory>
 
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp
index c89469bafb5..d47b13067cd 100644
--- a/src/server/shared/Cryptography/SHA1.cpp
+++ b/src/server/shared/Cryptography/SHA1.cpp
@@ -18,6 +18,7 @@
 
 #include "SHA1.h"
 #include "BigNumber.h"
+#include <cstring>
 #include <stdarg.h>
 
 SHA1Hash::SHA1Hash()
diff --git a/src/server/shared/Cryptography/WardenKeyGeneration.h b/src/server/shared/Cryptography/WardenKeyGeneration.h
index 11bc00d641a..9832d5a9c72 100644
--- a/src/server/shared/Cryptography/WardenKeyGeneration.h
+++ b/src/server/shared/Cryptography/WardenKeyGeneration.h
@@ -18,6 +18,8 @@
 
 #include "SHA1.h"
 
+#include <cstring>
+
 #ifndef _WARDEN_KEY_GENERATION_H
 #define _WARDEN_KEY_GENERATION_H
 
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index aa57a65167d..8865c70fdf8 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -21,15 +21,16 @@
 
 #include "CompilerDefs.h"
 
+#include <cstddef>
+#include <cinttypes>
+#include <climits>
+
 #if COMPILER == COMPILER_GNU
 #  if !defined(__STDC_FORMAT_MACROS)
 #    define __STDC_FORMAT_MACROS
 #  endif
 #endif
 
-#include <cstddef>
-#include <cinttypes>
-
 #define TRINITY_LITTLEENDIAN 0
 #define TRINITY_BIGENDIAN    1
 
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index e9e57415073..fe55982f15f 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -35,8 +35,8 @@ class ObjectRegistry
 
         static ObjectRegistry<T, Key>* instance()
         {
-            static ObjectRegistry<T, Key>* instance = new ObjectRegistry<T, Key>();
-            return instance;
+            static ObjectRegistry<T, Key> instance;
+            return &instance;
         }
 
         /// Returns a registry item
diff --git a/src/server/shared/Logging/AppenderConsole.cpp b/src/server/shared/Logging/AppenderConsole.cpp
index 8102d3b6021..20923162906 100644
--- a/src/server/shared/Logging/AppenderConsole.cpp
+++ b/src/server/shared/Logging/AppenderConsole.cpp
@@ -16,14 +16,14 @@
  */
 
 #include <sstream>
-#if PLATFORM == PLATFORM_WINDOWS
-    #include <windows.h>
-#endif
 
 #include "AppenderConsole.h"
 #include "Config.h"
 #include "Util.h"
 
+#if PLATFORM == PLATFORM_WINDOWS
+  #include <Windows.h>
+#endif
 
 AppenderConsole::AppenderConsole(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags):
 Appender(id, name, APPENDER_CONSOLE, level, flags), _colored(false)
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index e739c9eaf4e..8ae8db5bf5f 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -43,15 +43,15 @@ class Log
 
         static Log* instance(boost::asio::io_service* ioService = nullptr)
         {
-            static Log* instance = new Log();
+            static Log instance;
 
             if (ioService != nullptr)
             {
-                instance->_ioService = ioService;
-                instance->_strand = new boost::asio::strand(*ioService);
+                instance._ioService = ioService;
+                instance._strand = new boost::asio::strand(*ioService);
             }
             
-            return instance;
+            return &instance;
         }
 
         void LoadFromConfig();
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index a68d836252d..446ee889c90 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -21,8 +21,15 @@
 #include "utf8.h"
 #include "SFMT.h"
 #include "Errors.h" // for ASSERT
+#include <stdarg.h>
 #include <boost/thread/tss.hpp>
 
+#if PLATFORM == PLATFORM_UNIX
+  #include <sys/socket.h>
+  #include <netinet/in.h>
+  #include <arpa/inet.h>
+#endif
+
 static boost::thread_specific_ptr<SFMTRand> sfmtRand;
 
 static SFMTRand* GetRng()