From ffe4cc9c5a0038dc7b721acb362867e5b1fd18b9 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 5 Jan 2015 15:03:50 +0000
Subject: [PATCH 1/2] Common: Remove the unused x86-specific 128-bit float
type.
---
src/common/common_types.h | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/common/common_types.h b/src/common/common_types.h
index c74c74f0f..0e86cb2cf 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -26,7 +26,6 @@
#include <cmath>
#include <cstdint>
-#include <xmmintrin.h> // data_types__m128.cpp
typedef std::uint8_t u8; ///< 8-bit unsigned byte
typedef std::uint16_t u16; ///< 16-bit unsigned short
@@ -67,16 +66,6 @@ union t64 {
u8 _u8[8]; ///< 8-bit unsigned char(s)
};
-/// Union for fast 128-bit type casting
-union t128 {
- struct
- {
- t64 ps0; ///< 64-bit paired single 0
- t64 ps1; ///< 64-bit paired single 1
- };
- __m128 a; ///< 128-bit floating point (__m128 maps to the XMM[0-7] registers)
-};
-
namespace Common {
/// Rectangle data structure
class Rect {
From 66e06f65c40bfe5a602e456fa1f217b59b65ab7f Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 5 Jan 2015 15:05:28 +0000
Subject: [PATCH 2/2] Common: Use std::abs instead of abs, using abs with cmath
fails on some systems.
---
src/common/common_types.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/common/common_types.h b/src/common/common_types.h
index 0e86cb2cf..94e1406b1 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -26,6 +26,7 @@
#include <cmath>
#include <cstdint>
+#include <cstdlib>
typedef std::uint8_t u8; ///< 8-bit unsigned byte
typedef std::uint16_t u16; ///< 16-bit unsigned short
@@ -83,8 +84,8 @@ public:
int x1_; ///< Rect bottom left X-coordinate
int y1_; ///< Rect bottom right Y-coordinate
- inline u32 width() const { return abs(x1_ - x0_); }
- inline u32 height() const { return abs(y1_ - y0_); }
+ inline u32 width() const { return std::abs(x1_ - x0_); }
+ inline u32 height() const { return std::abs(y1_ - y0_); }
inline bool operator == (const Rect& val) const {
return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_);