Merge commit 'origin/master' into 320

src/shared/Auth/BigNumber.cpp

@@ -186,21 +186,6 @@ uint8 *BigNumber::AsByteArray(int minSize)
     return _array;
 }
 
-ByteBuffer BigNumber::AsByteBuffer()
-{
-    ByteBuffer ret(GetNumBytes());
-    ret.append(AsByteArray(), GetNumBytes());
-    return ret;
-}
-
-std::vector<uint8> BigNumber::AsByteVector()
-{
-    std::vector<uint8> ret;
-    ret.resize(GetNumBytes());
-    memcpy(&ret[0], AsByteArray(), GetNumBytes());
-    return ret;
-}
-
 const char *BigNumber::AsHexStr()
 {
     return BN_bn2hex(_bn);

src/shared/Auth/BigNumber.h

@@ -20,7 +20,6 @@
 #define _AUTH_BIGNUMBER_H
 
 #include "Common.h"
-#include "ByteBuffer.h"
 
 struct bignum_st;
 
@@ -83,8 +82,6 @@ class BigNumber
 
         uint32 AsDword();
         uint8* AsByteArray(int minSize = 0);
-        ByteBuffer AsByteBuffer();
-        std::vector<uint8> AsByteVector();
 
         const char *AsHexStr();
         const char *AsDecStr();

src/shared/Auth/Sha1.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "Auth/Sha1.h"
+#include "Auth/BigNumber.h"
 #include <stdarg.h>
 
 Sha1Hash::Sha1Hash()

src/shared/Auth/Sha1.h

@@ -22,7 +22,8 @@
 #include "Common.h"
 #include <openssl/sha.h>
 #include <openssl/crypto.h>
-#include "Auth/BigNumber.h"
+
+class BigNumber;
 
 class Sha1Hash
 {

src/shared/Threading.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "Threading.h"
+#include "Errors.h"
 #include <ace/OS_NS_unistd.h>
 #include <ace/Sched_Params.h>
 #include <vector>

src/shared/Threading.h

@@ -23,7 +23,6 @@
 #include <ace/TSS_T.h>
 #include "ace/Atomic_Op.h"
 #include <assert.h>
-#include "Errors.h"
 
 namespace ACE_Based
 {

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8485"
+ #define REVISION_NR "8498"
 #endif // __REVISION_NR_H__

src/shared/revision_sql.h

@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_8469_01_characters_character_spell"
- #define REVISION_DB_MANGOS "required_8482_01_mangos_spell_elixir"
+ #define REVISION_DB_MANGOS "required_8498_01_mangos_spell_proc_event"
  #define REVISION_DB_REALMD "required_8332_01_realmd_realmcharacters"
 #endif // __REVISION_SQL_H__