From db8fdd94ed54f46e3482ea33e8e13bf1b3940350 Mon Sep 17 00:00:00 2001 From: MitchesD Date: Sat, 30 May 2015 19:34:25 +0200 Subject: Merge pull request #14782 from doctaweeks/fixes-for-6.x Minor fixes for 6.x (cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93) Conflicts: src/server/bnetserver/Main.cpp src/server/game/Battlegrounds/Zones/BattlegroundBFG.h src/server/game/Battlegrounds/Zones/BattlegroundTP.h src/server/game/Chat/Channels/Channel.h src/server/game/Entities/Player/Player.h src/server/game/Quests/QuestDef.h src/server/scripts/OutdoorPvP/OutdoorPvPNA.h src/server/shared/Cryptography/SHA256.h --- src/server/shared/Cryptography/SHA1.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/shared/Cryptography') diff --git a/src/server/shared/Cryptography/SHA1.h b/src/server/shared/Cryptography/SHA1.h index ebd9f721d4a..f59bdc25556 100644 --- a/src/server/shared/Cryptography/SHA1.h +++ b/src/server/shared/Cryptography/SHA1.h @@ -39,8 +39,8 @@ class SHA1Hash void Initialize(); void Finalize(); - uint8 *GetDigest(void) { return mDigest; }; - int GetLength(void) const { return SHA_DIGEST_LENGTH; }; + uint8 *GetDigest(void) { return mDigest; } + int GetLength(void) const { return SHA_DIGEST_LENGTH; } private: SHA_CTX mC; -- cgit v1.2.3