Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vincent-Michael
2013-08-19 15:05:11 +02:00
parent f16f427c48 7679145da5
commit 9727cc49ef
4 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/shared/Cryptography/BigNumber.cpp
View File

@@ -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

4
src/server/shared/Cryptography/OpenSSLCrypto.cpp
View File

@@ -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());
}