diff options
author | Shauren <shauren.trinity@gmail.com> | 2018-12-09 16:07:38 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2018-12-09 16:07:38 +0100 |
commit | e9bcae1fada64bc3400c3204f7365edcecd640cc (patch) | |
tree | 2663fbf345436155abd2687415aadd9afe892144 /src | |
parent | 07636dc9af99faf3b354e18c1bca5f6ebe84931f (diff) |
Core/Misc: Fixed nopch and clang 6.0 warnings
Diffstat (limited to 'src')
4 files changed, 9 insertions, 7 deletions
diff --git a/src/common/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp index cb1cf17c1c6..0ffcb17d61a 100644 --- a/src/common/Cryptography/OpenSSLCrypto.cpp +++ b/src/common/Cryptography/OpenSSLCrypto.cpp @@ -33,6 +33,7 @@ static void lockingCallback(int mode, int type, const char* /*file*/, int /*line static void threadIdCallback(CRYPTO_THREADID * id) { + (void)id; CRYPTO_THREADID_set_numeric(id, std::hash<std::thread::id>()(std::this_thread::get_id())); } @@ -41,9 +42,13 @@ void OpenSSLCrypto::threadsSetup() cryptoLocks.resize(CRYPTO_num_locks()); for(int i = 0 ; i < CRYPTO_num_locks(); ++i) { - cryptoLocks[i] = new std::mutex; + cryptoLocks[i] = new std::mutex(); } + + (void)&threadIdCallback; CRYPTO_THREADID_set_callback(threadIdCallback); + + (void)&lockingCallback; CRYPTO_set_locking_callback(lockingCallback); } diff --git a/src/server/game/Server/Packets/InspectPackets.h b/src/server/game/Server/Packets/InspectPackets.h index c6437f182f7..20d8f42ede2 100644 --- a/src/server/game/Server/Packets/InspectPackets.h +++ b/src/server/game/Server/Packets/InspectPackets.h @@ -18,6 +18,7 @@ #pragma once #include "Packet.h" +#include "DBCEnums.h" #include "ItemPacketsCommon.h" #include "ObjectGuid.h" #include "SharedDefines.h" diff --git a/src/server/game/Server/Packets/SystemPackets.h b/src/server/game/Server/Packets/SystemPackets.h index 4d0812e7e67..a225807512a 100644 --- a/src/server/game/Server/Packets/SystemPackets.h +++ b/src/server/game/Server/Packets/SystemPackets.h @@ -19,6 +19,7 @@ #define SystemPackets_h__ #include "Packet.h" +#include "ObjectGuid.h" #include "Optional.h" namespace WorldPackets diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 7ca0d014c8a..2db0e7a24e1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1626,8 +1626,6 @@ class FlameLeviathanPursuedTargetSelector }; public: - explicit FlameLeviathanPursuedTargetSelector(Unit* unit) : _me(unit) { }; - bool operator()(WorldObject* target) const { //! No players, only vehicles. Pursue is never cast on players. @@ -1656,9 +1654,6 @@ class FlameLeviathanPursuedTargetSelector return !playerFound; } - - private: - Unit const* _me; }; class spell_pursue : public SpellScriptLoader @@ -1679,7 +1674,7 @@ class spell_pursue : public SpellScriptLoader private: void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove_if(FlameLeviathanPursuedTargetSelector(GetCaster())); + targets.remove_if(FlameLeviathanPursuedTargetSelector()); if (!targets.empty()) { //! In the end, only one target should be selected |