diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2017-09-27 15:45:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 15:45:38 -0500 |
| commit | 0d42706a7b50f0d2444d56932297480e4a4a3ae6 (patch) | |
| tree | ac52819463dec69d83a82783e202da8148be3ba7 /src/common/vector_math.h | |
| parent | 5620327e0342bd908359805f396748335fba04a2 (diff) | |
| parent | a321bce37834c1f3034bd87df14fc71c13e6b84a (diff) | |
Merge pull request #2907 from Subv/warnings3
Disable unary operator- on Math::Vec2/Vec3/Vec4 for unsigned types.
Diffstat (limited to 'src/common/vector_math.h')
| -rw-r--r-- | src/common/vector_math.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common/vector_math.h b/src/common/vector_math.h index 6e2a5ad601..2b05f66eef 100644 --- a/src/common/vector_math.h +++ b/src/common/vector_math.h @@ -31,6 +31,7 @@ #pragma once #include <cmath> +#include <type_traits> namespace Math { @@ -90,7 +91,8 @@ public: y -= other.y; } - Vec2<decltype(-T{})> operator-() const { + template <typename U = T> + Vec2<std::enable_if_t<std::is_signed<U>::value, U>> operator-() const { return MakeVec(-x, -y); } Vec2<decltype(T{} * T{})> operator*(const Vec2& other) const { @@ -247,7 +249,8 @@ public: z -= other.z; } - Vec3<decltype(-T{})> operator-() const { + template <typename U = T> + Vec3<std::enable_if_t<std::is_signed<U>::value, U>> operator-() const { return MakeVec(-x, -y, -z); } Vec3<decltype(T{} * T{})> operator*(const Vec3& other) const { @@ -462,7 +465,8 @@ public: w -= other.w; } - Vec4<decltype(-T{})> operator-() const { + template <typename U = T> + Vec4<std::enable_if_t<std::is_signed<U>::value, U>> operator-() const { return MakeVec(-x, -y, -z, -w); } Vec4<decltype(T{} * T{})> operator*(const Vec4& other) const { @@ -720,4 +724,4 @@ static inline Vec4<T> MakeVec(const T& x, const Vec3<T>& yzw) { return MakeVec(x, yzw[0], yzw[1], yzw[2]); } -} // namespace +} // namespace Math |