citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

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

Common: silence Vec warnings on msvc
This commit is contained in:
bunnei 2015-11-18 11:49:56 -05:00
parent 161be512fd 1f89d5d184
commit f971aceac3
1 changed files with 4 additions and 0 deletions
Show Stats 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
#include <cmath>
#include <type_traits>
namespace Math {
@ -90,6 +91,7 @@ public:
{
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
{
return MakeVec(-x,-y);
@ -220,6 +222,7 @@ public:
{
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
{
return MakeVec(-x,-y,-z);
@ -390,6 +393,7 @@ public:
{
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
{
return MakeVec(-x,-y,-z,-w);