From 32d189e8b7ce60c8902f787aaa6665d43c25831e Mon Sep 17 00:00:00 2001
From: ariel- <ariel-@users.noreply.github.com>
Date: Fri, 12 Jan 2018 00:07:29 -0300
Subject: [PATCH] Core/Misc: kill whitespace

# Conflicts:
#	sql/updates/world/3.3.5/2018_01_10_04_world_335.sql
#	src/server/game/Combat/ThreatManager.h
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/scripts/Kalimdor/boss_azuregos.cpp
---
 src/server/game/Combat/ThreatManager.cpp | 2 +-
 src/server/game/Combat/ThreatManager.h   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 3677476cd47..622931ad828 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -334,7 +334,7 @@ void ThreatManager::AddThreat(Unit* target, float amount, SpellInfo const* spell
         {
             float const origAmount = amount;
             // intentional iteration by index - there's a nested AddThreat call further down that might cause AI calls which might modify redirect info through spells
-            for (size_t i=0; i<redirInfo.size(); ++i)
+            for (size_t i = 0; i < redirInfo.size(); ++i)
             {
                 auto const pair = redirInfo[i]; // (victim,pct)
                 Unit* redirTarget = nullptr;
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index 16714502de1..14ee60aea77 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -15,6 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+ #ifndef TRINITY_THREATMANAGER_H
+ #define TRINITY_THREATMANAGER_H
+
 #include "Common.h"
 #include "IteratorPair.h"
 #include "ObjectGuid.h"
@@ -271,5 +274,5 @@ class TC_GAME_API ThreatReference
 };
 
 inline bool CompareThreatLessThan::operator()(ThreatReference const* a, ThreatReference const* b) const { return ThreatManager::CompareReferencesLT(a, b, 1.0f); }
- 
+
  #endif