Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 05:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1239 from wwylele/silent-vec-warning

Browse source 
Common: silence Vec warnings on msvc
This commit is contained in:
bunnei 2015-11-18 11:49:56 -05:00
commit f971aceac3
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/common/vector_math.h
View file

@ -32,6 +32,7 @@
#pragma once #pragma once
#include <cmath> #include <cmath>
#include <type_traits>
namespace Math { namespace Math {
@ -90,6 +91,7 @@ public:
{ {
x-=other.x; y-=other.y; x-=other.x; y-=other.y;
} }
template<typename Q = T,class = typename std::enable_if<std::is_signed<Q>::value>::type>
Vec2<decltype(-T{})> operator -() const Vec2<decltype(-T{})> operator -() const
{ {
return MakeVec(-x,-y); return MakeVec(-x,-y);
@ -220,6 +222,7 @@ public:
{ {
x-=other.x; y-=other.y; z-=other.z; x-=other.x; y-=other.y; z-=other.z;
} }
template<typename Q = T,class = typename std::enable_if<std::is_signed<Q>::value>::type>
Vec3<decltype(-T{})> operator -() const Vec3<decltype(-T{})> operator -() const
{ {
return MakeVec(-x,-y,-z); return MakeVec(-x,-y,-z);
@ -390,6 +393,7 @@ public:
{ {
x-=other.x; y-=other.y; z-=other.z; w-=other.w; x-=other.x; y-=other.y; z-=other.z; w-=other.w;
} }
template<typename Q = T,class = typename std::enable_if<std::is_signed<Q>::value>::type>
Vec4<decltype(-T{})> operator -() const Vec4<decltype(-T{})> operator -() const
{ {
return MakeVec(-x,-y,-z,-w); return MakeVec(-x,-y,-z,-w);