diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:11:14 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:11:14 +0100 |
| commit | 68e0ef80390d0163ec7b9cef9b949db8ea19262d (patch) | |
| tree | d34fcd889d598680609190fdc6cc6501c42abaee /src/server/shared/Utilities/Util.h | |
| parent | dd9d7e6870f32a76da99f00d9c16812332a9e2f8 (diff) | |
| parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/DataStores/DBCEnums.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.h
src/server/game/Instances/InstanceScript.h
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/OutdoorPvP/OutdoorPvP.h
src/server/game/Quests/QuestDef.h
src/server/game/Spells/Spell.h
src/server/game/Spells/SpellInfo.h
Diffstat (limited to 'src/server/shared/Utilities/Util.h')
| -rwxr-xr-x | src/server/shared/Utilities/Util.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index 64a89885350..835473045d4 100755 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -459,7 +459,7 @@ public: return 0; } return 0; - }; + } template<class type> inline bool operator < (type & right) const @@ -472,7 +472,7 @@ public: return 0; } return 0; - }; + } template<class type> inline bool operator != (type & right) @@ -492,7 +492,7 @@ public: || part[2]!=right.part[2]) return true; return false; - }; + } template<class type> inline bool operator == (type & right) @@ -502,7 +502,7 @@ public: || part[2]!=right.part[2]) return false; return true; - }; + } template<class type> inline bool operator == (type & right) const @@ -512,7 +512,7 @@ public: || part[2]!=right.part[2]) return false; return true; - }; + } template<class type> inline void operator = (type & right) @@ -520,7 +520,7 @@ public: part[0]=right.part[0]; part[1]=right.part[1]; part[2]=right.part[2]; - }; + } template<class type> inline flag96 operator & (type & right) @@ -528,20 +528,21 @@ public: flag96 ret(part[0] & right.part[0], part[1] & right.part[1], part[2] & right.part[2]); return ret; - }; + } + template<class type> inline flag96 operator & (type & right) const { flag96 ret(part[0] & right.part[0], part[1] & right.part[1], part[2] & right.part[2]); return ret; - }; + } template<class type> inline void operator &= (type & right) { *this=*this & right; - }; + } template<class type> inline flag96 operator | (type & right) @@ -549,7 +550,7 @@ public: flag96 ret(part[0] | right.part[0], part[1] | right.part[1], part[2] | right.part[2]); return ret; - }; + } template<class type> inline flag96 operator | (type & right) const @@ -557,13 +558,13 @@ public: flag96 ret(part[0] | right.part[0], part[1] | right.part[1], part[2] | right.part[2]); return ret; - }; + } template<class type> inline void operator |= (type & right) { *this=*this | right; - }; + } inline void operator ~ () { @@ -578,7 +579,7 @@ public: flag96 ret(part[0] ^ right.part[0], part[1] ^ right.part[1], part[2] ^ right.part[2]); return ret; - }; + } template<class type> inline flag96 operator ^ (type & right) const @@ -586,13 +587,13 @@ public: flag96 ret(part[0] ^ right.part[0], part[1] ^ right.part[1], part[2] ^ right.part[2]); return ret; - }; + } template<class type> inline void operator ^= (type & right) { *this=*this^right; - }; + } inline operator bool() const { |