From 7d873302497c1de3e792f22b07e0a8d7c62e59f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 2 Sep 2013 23:38:02 +0200 Subject: [PATCH] Gaah. --- src/Math/RectangularMatrix.h | 4 ++-- src/Math/Vector.h | 42 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index c867564ed..901dbb0cd 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -511,7 +511,7 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit return number/static_cast&>(matrix); \ } \ template inline __VA_ARGS__ operator*(const Vector& vector, const RectangularMatrix& matrix) { \ - return Math::RectangularMatrix<1, size, T>(vector)*matrix; \ + return Math::RectangularMatrix<1, size, T>(vector)*matrix; \ } #define MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(size, Type) \ @@ -522,7 +522,7 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit return number/static_cast&>(matrix); \ } \ template inline Type operator*(const Vector& vector, const RectangularMatrix& matrix) { \ - return Math::RectangularMatrix<1, size, T>(vector)*matrix; \ + return Math::RectangularMatrix<1, size, T>(vector)*matrix; \ } #endif diff --git a/src/Math/Vector.h b/src/Math/Vector.h index dc5980e0f..e32c41f2d 100644 --- a/src/Math/Vector.h +++ b/src/Math/Vector.h @@ -1051,84 +1051,84 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit #define MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(size, Type) \ template inline Type operator*(typename std::common_type::type number, const Type& vector) { \ - return number*static_cast&>(vector); \ + return number*static_cast&>(vector); \ } \ template inline Type operator/(typename std::common_type::type number, const Type& vector) { \ - return number/static_cast&>(vector); \ + return number/static_cast&>(vector); \ } \ \ template inline typename std::enable_if::value, Type>::type operator~(const Type& vector) { \ - return ~static_cast&>(vector); \ + return ~static_cast&>(vector); \ } \ template inline typename std::enable_if::value, Type&>::type operator&=(Type& a, const Math::Vector& b) { \ - static_cast&>(a) &= b; \ + static_cast&>(a) &= b; \ return a; \ } \ template inline typename std::enable_if::value, Type>::type operator&(const Type& a, const Math::Vector& b) { \ - return static_cast&>(a) & b; \ + return static_cast&>(a) & b; \ } \ template inline typename std::enable_if::value, Type&>::type operator|=(Type& a, const Math::Vector& b) { \ - static_cast&>(a) |= b; \ + static_cast&>(a) |= b; \ return a; \ } \ template inline typename std::enable_if::value, Type>::type operator|(const Type& a, const Math::Vector& b) { \ - return static_cast&>(a) | b; \ + return static_cast&>(a) | b; \ } \ template inline typename std::enable_if::value, Type&>::type operator^=(Type& a, const Math::Vector& b) { \ - static_cast&>(a) ^= b; \ + static_cast&>(a) ^= b; \ return a; \ } \ template inline typename std::enable_if::value, Type>::type operator^(const Type& a, const Math::Vector& b) { \ - return static_cast&>(a) ^ b; \ + return static_cast&>(a) ^ b; \ } \ template inline typename std::enable_if::value, Type&>::type operator<<=(Type& vector, typename std::common_type::type shift) { \ - static_cast&>(vector) <<= shift; \ + static_cast&>(vector) <<= shift; \ return vector; \ } \ template inline typename std::enable_if::value, Type>::type operator<<(const Type& vector, typename std::common_type::type shift) { \ return static_cast&>(vector) << shift; \ } \ template inline typename std::enable_if::value, Type&>::type operator>>=(Type& vector, typename std::common_type::type shift) { \ - static_cast&>(vector) >>= shift; \ + static_cast&>(vector) >>= shift; \ return vector; \ } \ template inline typename std::enable_if::value, Type>::type operator>>(const Type& vector, typename std::common_type::type shift) { \ return static_cast&>(vector) >> shift; \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type&>::type operator*=(Type& vector, FloatingPoint number) { \ - static_cast&>(vector) *= number; \ + static_cast&>(vector) *= number; \ return vector; \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type>::type operator*(const Type& vector, FloatingPoint number) { \ - return static_cast&>(vector)*number; \ + return static_cast&>(vector)*number; \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type>::type operator*(FloatingPoint number, const Type& vector) { \ - return number*static_cast&>(vector); \ + return number*static_cast&>(vector); \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type&>::type operator/=(Type& vector, FloatingPoint number) { \ - static_cast&>(vector) /= number; \ + static_cast&>(vector) /= number; \ return vector; \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type>::type operator/(const Type& vector, FloatingPoint number) { \ - return static_cast&>(vector)/number; \ + return static_cast&>(vector)/number; \ } \ \ template inline typename std::enable_if::value && std::is_floating_point::value, Type&>::type operator*=(Type& a, const Math::Vector& b) { \ - static_cast&>(a) *= b; \ + static_cast&>(a) *= b; \ return a; \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type>::type operator*(const Type& a, const Math::Vector& b) { \ - return static_cast&>(a)*b; \ + return static_cast&>(a)*b; \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type>::type operator*(const Math::Vector& a, const Type& b) { \ - return a*static_cast&>(b); \ + return a*static_cast&>(b); \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type&>::type operator/=(Type& a, const Math::Vector& b) { \ - static_cast&>(a) /= b; \ + static_cast&>(a) /= b; \ return a; \ } \ template inline typename std::enable_if::value && std::is_floating_point::value, Type>::type operator/(const Type& a, const Math::Vector& b) { \ - return static_cast&>(a)/b; \ + return static_cast&>(a)/b; \ } #endif