From dc53dad8a44292bcb555db9fdc07eb255a838cac Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 13 Jun 2015 14:04:10 +0200
Subject: Core/Misc: Warning fixes

---
 .../scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp      | 2 +-
 src/server/shared/Threading/Callback.h                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index d261b7a623a..a4a0b46ceb7 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -1125,7 +1125,7 @@ class npc_meteor_strike_flame : public CreatureScript
                 SetCombatMovement(false);
             }
 
-            void SetGUID(ObjectGuid guid, int32 /*id = 0 */)
+            void SetGUID(ObjectGuid guid, int32 /*id = 0 */) override
             {
                 _rootOwnerGuid = guid;
             }
diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h
index 16ebc5dbc06..23f2807b253 100644
--- a/src/server/shared/Threading/Callback.h
+++ b/src/server/shared/Threading/Callback.h
@@ -97,7 +97,7 @@ class QueryCallback
         //! Resets all underlying variables (param, result and stage)
         void Reset()
         {
-            SetParam(NULL);
+            SetParam(ParamType());
             FreeResult();
             ResetStage();
         }
-- 
cgit v1.2.3