diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 02:41:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 02:41:49 +0100 |
| commit | 5d2ba0d2f7855ffe18ff8e5a96156ca17e50cd2b (patch) | |
| tree | 0341572be05213e0dbfb94720577616d9e3b002f /src/lib/util.h | |
| parent | 7ef2ba523ca2ddc0470f5837bc88ad9c597361e2 (diff) | |
Windows apparently has Rectangle in the global namespace.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index da7e73f20..c2706a594 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -122,16 +122,16 @@ struct Position }; /** A rectangle */ -struct Rectangle +struct Rect { - Rectangle () + Rect () : x (0) , y (0) , width (0) , height (0) {} - Rectangle (int x_, int y_, int w_, int h_) + Rect (int x_, int y_, int w_, int h_) : x (x_) , y (y_) , width (w_) @@ -151,7 +151,7 @@ struct Rectangle return Size (width, height); } - Rectangle intersection (Rectangle const & other) const; + Rect intersection (Rect const & other) const; }; extern std::string crop_string (Position, Size); |