diff options
| author | 2017-07-11 19:51:29 +0300 | |
|---|---|---|
| committer | 2017-07-11 19:51:29 +0300 | |
| commit | f3660ba9dd13f342c591aaa9901e94b6caee8d9a (patch) | |
| tree | 9332c3fa8ad03a7e03d384c1403100734d7a4f61 /src/common/vector_math.h | |
| parent | SwRasterizer/Lighting: Move the clamp highlight calculation to the end of the... (diff) | |
| download | yuzu-f3660ba9dd13f342c591aaa9901e94b6caee8d9a.tar.gz yuzu-f3660ba9dd13f342c591aaa9901e94b6caee8d9a.tar.xz yuzu-f3660ba9dd13f342c591aaa9901e94b6caee8d9a.zip | |
vector_math: remove broken SFINAE stuff
this was originally added to eliminate warnings on MSVC, but it doesn't work for custom types.
Diffstat (limited to 'src/common/vector_math.h')
| -rw-r--r-- | src/common/vector_math.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/vector_math.h b/src/common/vector_math.h index d0fe0e405..49ae87f6d 100644 --- a/src/common/vector_math.h +++ b/src/common/vector_math.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #pragma once | 31 | #pragma once |
| 32 | 32 | ||
| 33 | #include <cmath> | 33 | #include <cmath> |
| 34 | #include <type_traits> | ||
| 35 | 34 | ||
| 36 | namespace Math { | 35 | namespace Math { |
| 37 | 36 | ||
| @@ -90,7 +89,7 @@ public: | |||
| 90 | x -= other.x; | 89 | x -= other.x; |
| 91 | y -= other.y; | 90 | y -= other.y; |
| 92 | } | 91 | } |
| 93 | template <typename Q = T, class = typename std::enable_if<std::is_signed<Q>::value>::type> | 92 | |
| 94 | Vec2<decltype(-T{})> operator-() const { | 93 | Vec2<decltype(-T{})> operator-() const { |
| 95 | return MakeVec(-x, -y); | 94 | return MakeVec(-x, -y); |
| 96 | } | 95 | } |
| @@ -247,7 +246,7 @@ public: | |||
| 247 | y -= other.y; | 246 | y -= other.y; |
| 248 | z -= other.z; | 247 | z -= other.z; |
| 249 | } | 248 | } |
| 250 | template <typename Q = T, class = typename std::enable_if<std::is_signed<Q>::value>::type> | 249 | |
| 251 | Vec3<decltype(-T{})> operator-() const { | 250 | Vec3<decltype(-T{})> operator-() const { |
| 252 | return MakeVec(-x, -y, -z); | 251 | return MakeVec(-x, -y, -z); |
| 253 | } | 252 | } |