diff options
| author |  Huw Pascoe | 2017-09-27 00:26:09 +0100 |
|---|---|---|
| committer | Huw Pascoe | 2017-09-30 09:34:35 +0100 |
| commit | a13ab958cbba75bc9abd1ca50f3030a10a75784e (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/common/vector_math.h | |
| parent | Merge pull request #2961 from Subv/load_titles (diff) | |
| download | yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.gz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.xz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.zip | |
Fixed type conversion ambiguity
Diffstat (limited to 'src/common/vector_math.h')
| -rw-r--r-- | src/common/vector_math.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/common/vector_math.h b/src/common/vector_math.h index 2b05f66ee..3f0057d9e 100644 --- a/src/common/vector_math.h +++ b/src/common/vector_math.h | |||
| @@ -104,8 +104,7 @@ public: | |||
| 104 | } | 104 | } |
| 105 | template <typename V> | 105 | template <typename V> |
| 106 | void operator*=(const V& f) { | 106 | void operator*=(const V& f) { |
| 107 | x *= f; | 107 | *this = *this * f; |
| 108 | y *= f; | ||
| 109 | } | 108 | } |
| 110 | template <typename V> | 109 | template <typename V> |
| 111 | Vec2<decltype(T{} / V{})> operator/(const V& f) const { | 110 | Vec2<decltype(T{} / V{})> operator/(const V& f) const { |
| @@ -262,9 +261,7 @@ public: | |||
| 262 | } | 261 | } |
| 263 | template <typename V> | 262 | template <typename V> |
| 264 | void operator*=(const V& f) { | 263 | void operator*=(const V& f) { |
| 265 | x *= f; | 264 | *this = *this * f; |
| 266 | y *= f; | ||
| 267 | z *= f; | ||
| 268 | } | 265 | } |
| 269 | template <typename V> | 266 | template <typename V> |
| 270 | Vec3<decltype(T{} / V{})> operator/(const V& f) const { | 267 | Vec3<decltype(T{} / V{})> operator/(const V& f) const { |
| @@ -478,10 +475,7 @@ public: | |||
| 478 | } | 475 | } |
| 479 | template <typename V> | 476 | template <typename V> |
| 480 | void operator*=(const V& f) { | 477 | void operator*=(const V& f) { |
| 481 | x *= f; | 478 | *this = *this * f; |
| 482 | y *= f; | ||
| 483 | z *= f; | ||
| 484 | w *= f; | ||
| 485 | } | 479 | } |
| 486 | template <typename V> | 480 | template <typename V> |
| 487 | Vec4<decltype(T{} / V{})> operator/(const V& f) const { | 481 | Vec4<decltype(T{} / V{})> operator/(const V& f) const { |