diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-22 22:54:56 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-22 22:54:56 -0400 |
| commit | 1de7e8cbe4ee9aab3bc920721a90ef63537771b8 (patch) | |
| tree | 4aae70232dc6d148af003a4d9f1c4f76aff5467b /src/common/common_types.h | |
| parent | 9592d61037d05dc53b454644671a441788996208 (diff) | |
| parent | 204c6bfeca2d3bccfe6602699c0b3420f88aaf07 (diff) | |
Merge branch 'master' of https://github.com/bunnei/citra
Diffstat (limited to 'src/common/common_types.h')
| -rw-r--r-- | src/common/common_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h index 4289b88d3..402410507 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -62,7 +62,7 @@ typedef signed long long s64; ///< 64-bit signed int typedef float f32; ///< 32-bit floating point typedef double f64; ///< 64-bit floating point -#include "common/swap.h" +#include "common/common.h" /// Union for fast 16-bit type casting union t16 { @@ -100,6 +100,7 @@ union t128 { __m128 a; ///< 128-bit floating point (__m128 maps to the XMM[0-7] registers) }; +namespace common { /// Rectangle data structure class Rect { public: @@ -123,3 +124,4 @@ public: return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_); } }; +} |