diff options
author | archshift <admin@archshift.com> | 2014-04-27 22:21:46 -0700 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-04-27 22:21:46 -0700 |
commit | ff48c8bed3a7329b57f3889b36492f31e6d44700 (patch) | |
tree | db1058aa6b4f954957d6e5bb726ff8dcb30018c1 /src/common/common_types.h | |
parent | 81cb80997ac3e0867c954cedcf3b43e7096d35d0 (diff) |
Rect to BasicRect
Somewhere along the line an OSX header had already taken the name Rect.
Diffstat (limited to 'src/common/common_types.h')
-rw-r--r-- | src/common/common_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h index 4289b88d..50cf1873 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -101,15 +101,15 @@ union t128 { }; /// Rectangle data structure -class Rect { +class BasicRect { public: - Rect(int x0=0, int y0=0, int x1=0, int y1=0) { + BasicRect(int x0=0, int y0=0, int x1=0, int y1=0) { x0_ = x0; y0_ = y0; x1_ = x1; y1_ = y1; } - ~Rect() { } + ~BasicRect() { } int x0_; ///< Rect top left X-coordinate int y0_; ///< Rect top left Y-coordinate @@ -119,7 +119,7 @@ public: inline u32 width() const { return abs(x1_ - x0_); } inline u32 height() const { return abs(y1_ - y0_); } - inline bool operator == (const Rect& val) const { + inline bool operator == (const BasicRect& val) const { return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_); } }; |