summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorGravatar archshift2014-04-27 22:21:46 -0700
committerGravatar archshift2014-04-27 22:21:46 -0700
commitff48c8bed3a7329b57f3889b36492f31e6d44700 (patch)
treedb1058aa6b4f954957d6e5bb726ff8dcb30018c1 /src/common
parentadd missing bswap functions (diff)
downloadyuzu-ff48c8bed3a7329b57f3889b36492f31e6d44700.tar.gz
yuzu-ff48c8bed3a7329b57f3889b36492f31e6d44700.tar.xz
yuzu-ff48c8bed3a7329b57f3889b36492f31e6d44700.zip
Rect to BasicRect
Somewhere along the line an OSX header had already taken the name Rect.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common_types.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h
index 4289b88d3..50cf18738 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -101,15 +101,15 @@ union t128 {
101}; 101};
102 102
103/// Rectangle data structure 103/// Rectangle data structure
104class Rect { 104class BasicRect {
105public: 105public:
106 Rect(int x0=0, int y0=0, int x1=0, int y1=0) { 106 BasicRect(int x0=0, int y0=0, int x1=0, int y1=0) {
107 x0_ = x0; 107 x0_ = x0;
108 y0_ = y0; 108 y0_ = y0;
109 x1_ = x1; 109 x1_ = x1;
110 y1_ = y1; 110 y1_ = y1;
111 } 111 }
112 ~Rect() { } 112 ~BasicRect() { }
113 113
114 int x0_; ///< Rect top left X-coordinate 114 int x0_; ///< Rect top left X-coordinate
115 int y0_; ///< Rect top left Y-coordinate 115 int y0_; ///< Rect top left Y-coordinate
@@ -119,7 +119,7 @@ public:
119 inline u32 width() const { return abs(x1_ - x0_); } 119 inline u32 width() const { return abs(x1_ - x0_); }
120 inline u32 height() const { return abs(y1_ - y0_); } 120 inline u32 height() const { return abs(y1_ - y0_); }
121 121
122 inline bool operator == (const Rect& val) const { 122 inline bool operator == (const BasicRect& val) const {
123 return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_); 123 return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_);
124 } 124 }
125}; 125};