From 358c6a26d6cfea2bbfabee5a663c3a09056526c2 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 10 Sep 2012 13:03:38 +0200 Subject: Core: Warning fixes (Also some -pedantic under game folder) --- src/server/shared/Utilities/Util.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'src/server/shared/Utilities/Util.h') 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 inline bool operator < (type & right) const @@ -472,7 +472,7 @@ public: return 0; } return 0; - }; + } template inline bool operator != (type & right) @@ -492,7 +492,7 @@ public: || part[2]!=right.part[2]) return true; return false; - }; + } template inline bool operator == (type & right) @@ -502,7 +502,7 @@ public: || part[2]!=right.part[2]) return false; return true; - }; + } template inline bool operator == (type & right) const @@ -512,7 +512,7 @@ public: || part[2]!=right.part[2]) return false; return true; - }; + } template 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 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 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 inline void operator &= (type & right) { *this=*this & right; - }; + } template 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 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 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 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 inline void operator ^= (type & right) { *this=*this^right; - }; + } inline operator bool() const { -- cgit v1.2.3