citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Common: Use std::abs instead of abs, using abs with cmath fails on some systems.

This commit is contained in:
Emmanuel Gil Peyrot 2015-01-05 15:05:28 +00:00
parent ffe4cc9c5a
commit 66e06f65c4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/common_types.h
View File

@ -26,6 +26,7 @@
#include <cmath> #include <cmath>
#include <cstdint> #include <cstdint>
#include <cstdlib>
typedef std::uint8_t u8; ///< 8-bit unsigned byte typedef std::uint8_t u8; ///< 8-bit unsigned byte
typedef std::uint16_t u16; ///< 16-bit unsigned short typedef std::uint16_t u16; ///< 16-bit unsigned short
@ -83,8 +84,8 @@ public:
int x1_; ///< Rect bottom left X-coordinate int x1_; ///< Rect bottom left X-coordinate
int y1_; ///< Rect bottom right Y-coordinate int y1_; ///< Rect bottom right Y-coordinate
inline u32 width() const { return abs(x1_ - x0_); } inline u32 width() const { return std::abs(x1_ - x0_); }
inline u32 height() const { return abs(y1_ - y0_); } inline u32 height() const { return std::abs(y1_ - y0_); }
inline bool operator == (const Rect& val) const { inline bool operator == (const Rect& val) const {
return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_); return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_);