aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-06-13 14:04:10 +0200
committerShauren <shauren.trinity@gmail.com>2015-06-13 14:04:10 +0200
commitdc53dad8a44292bcb555db9fdc07eb255a838cac (patch)
tree2b5603a79cb756a317af99016f3f62eee47e9a5b
parent74eeefa5be163a55489f91c05d7dfd1cb624c78d (diff)
Core/Misc: Warning fixes
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp2
-rw-r--r--src/server/shared/Threading/Callback.h2
2 files changed, 2 insertions, 2 deletions
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();
}