diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-30 23:06:19 +0100 | 
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-30 23:06:19 +0100 | 
| commit | d61f3131fb3b149c5c075dee5507cbed29927a80 (patch) | |
| tree | 9ef1d57bbcdcf9ab8f255f7349036f3ef5fb50ff /src/server/shared/Cryptography/BigNumber.h | |
| parent | 872c239dbe0a0a289ed72b3204986df2a612f546 (diff) | |
| parent | e3d9768a50a3b2b700d65e0cc96e697a5c9d22dc (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
Diffstat (limited to 'src/server/shared/Cryptography/BigNumber.h')
| -rwxr-xr-x | src/server/shared/Cryptography/BigNumber.h | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/src/server/shared/Cryptography/BigNumber.h b/src/server/shared/Cryptography/BigNumber.h index 6646245a6a0..a27d74fb5c7 100755 --- a/src/server/shared/Cryptography/BigNumber.h +++ b/src/server/shared/Cryptography/BigNumber.h @@ -39,7 +39,7 @@ class BigNumber          void SetRand(int numbits); -        BigNumber operator=(const BigNumber &bn); +        BigNumber& operator=(const BigNumber &bn);          BigNumber operator+=(const BigNumber &bn);          BigNumber operator+(const BigNumber &bn) | 
