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

2 files changed, 4 insertions, 3 deletions

diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 38c274b7555..b2fce985f21 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -186,7 +186,8 @@ ACE_Auto_Array_Ptr<uint8> BigNumber::AsByteArray(int32 minSize, bool littleEndia
     if (littleEndian)
         std::reverse(array, array + length);
 
-    return ACE_Auto_Array_Ptr<uint8>(array);
+    ACE_Auto_Array_Ptr<uint8> ret(array);
+    return ret;
 }
 
 char * BigNumber::AsHexStr() const
diff --git a/src/server/shared/Cryptography/OpenSSLCrypto.cpp b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
index 12169433615..417be813347 100644
--- a/src/server/shared/Cryptography/OpenSSLCrypto.cpp
+++ b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
@@ -23,7 +23,7 @@
 
 std::vector<ACE_Thread_Mutex*> cryptoLocks;
 
-void lockingCallback(int mode, int type, const char *file, int line)
+static void lockingCallback(int mode, int type, const char* /*file*/, int /*line*/)
 {
     if (mode & CRYPTO_LOCK)
         cryptoLocks[type]->acquire();
@@ -31,7 +31,7 @@ void lockingCallback(int mode, int type, const char *file, int line)
         cryptoLocks[type]->release();
 }
 
-void threadIdCallback(CRYPTO_THREADID * id)
+static void threadIdCallback(CRYPTO_THREADID * id)
 {
     CRYPTO_THREADID_set_numeric(id, ACE_Thread::self());
 }