From da67a79222fa2da9e1ef546fead399b83564ff1f Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 17 Sep 2013 23:10:39 +0200 Subject: [PATCH] Removed invalid *= operators for non square matrix --- glm/core/type_mat2x3.hpp | 2 -- glm/core/type_mat2x3.inl | 7 ------- glm/core/type_mat2x4.hpp | 2 -- glm/core/type_mat2x4.inl | 7 ------- glm/core/type_mat3x2.hpp | 2 -- glm/core/type_mat3x2.inl | 7 ------- glm/core/type_mat3x4.hpp | 2 -- glm/core/type_mat3x4.inl | 7 ------- glm/core/type_mat4x2.hpp | 2 -- glm/core/type_mat4x2.inl | 7 ------- glm/core/type_mat4x3.hpp | 2 -- glm/core/type_mat4x3.inl | 7 ------- 12 files changed, 54 deletions(-) diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp index 02d7f4fc..0acd7a41 100644 --- a/glm/core/type_mat2x3.hpp +++ b/glm/core/type_mat2x3.hpp @@ -125,8 +125,6 @@ namespace detail template GLM_FUNC_DECL tmat2x3 & operator*= (U s); template - GLM_FUNC_DECL tmat2x3 & operator*= (tmat2x3 const & m); - template GLM_FUNC_DECL tmat2x3 & operator/= (U s); ////////////////////////////////////// diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl index d2ad0c65..56b441df 100644 --- a/glm/core/type_mat2x3.inl +++ b/glm/core/type_mat2x3.inl @@ -339,13 +339,6 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tmat2x3 & tmat2x3::operator*= (tmat2x3 const & m) - { - return (*this = tmat2x3(*this * m)); - } - template template GLM_FUNC_QUALIFIER tmat2x3 & tmat2x3::operator/= (U s) diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp index d3608dac..db68e435 100644 --- a/glm/core/type_mat2x4.hpp +++ b/glm/core/type_mat2x4.hpp @@ -127,8 +127,6 @@ namespace detail template GLM_FUNC_DECL tmat2x4& operator*= (U s); template - GLM_FUNC_DECL tmat2x4& operator*= (tmat2x4 const & m); - template GLM_FUNC_DECL tmat2x4& operator/= (U s); ////////////////////////////////////// diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl index 96543cc9..133fceee 100644 --- a/glm/core/type_mat2x4.inl +++ b/glm/core/type_mat2x4.inl @@ -342,13 +342,6 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tmat2x4& tmat2x4::operator*= (tmat2x4 const & m) - { - return (*this = tmat2x4(*this * m)); - } - template template GLM_FUNC_QUALIFIER tmat2x4 & tmat2x4::operator/= (U s) diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp index d4f78d04..876f4bc6 100644 --- a/glm/core/type_mat3x2.hpp +++ b/glm/core/type_mat3x2.hpp @@ -131,8 +131,6 @@ namespace detail template GLM_FUNC_DECL tmat3x2 & operator*= (U s); template - GLM_FUNC_DECL tmat3x2 & operator*= (tmat3x2 const & m); - template GLM_FUNC_DECL tmat3x2 & operator/= (U s); ////////////////////////////////////// diff --git a/glm/core/type_mat3x2.inl b/glm/core/type_mat3x2.inl index 2d992955..05541b48 100644 --- a/glm/core/type_mat3x2.inl +++ b/glm/core/type_mat3x2.inl @@ -369,13 +369,6 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x2& tmat3x2::operator*= (tmat3x2 const & m) - { - return (*this = tmat3x2(*this * m)); - } - template template GLM_FUNC_QUALIFIER tmat3x2 & tmat3x2::operator/= (U s) diff --git a/glm/core/type_mat3x4.hpp b/glm/core/type_mat3x4.hpp index 0d16a51a..6f73da24 100644 --- a/glm/core/type_mat3x4.hpp +++ b/glm/core/type_mat3x4.hpp @@ -131,8 +131,6 @@ namespace detail template GLM_FUNC_DECL tmat3x4 & operator*= (U s); template - GLM_FUNC_DECL tmat3x4 & operator*= (tmat3x4 const & m); - template GLM_FUNC_DECL tmat3x4 & operator/= (U s); ////////////////////////////////////// diff --git a/glm/core/type_mat3x4.inl b/glm/core/type_mat3x4.inl index 0186fc5d..b5165e86 100644 --- a/glm/core/type_mat3x4.inl +++ b/glm/core/type_mat3x4.inl @@ -368,13 +368,6 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator*= (tmat3x4 const & m) - { - return (*this = tmat3x4(*this * m)); - } - template template GLM_FUNC_QUALIFIER tmat3x4 & tmat3x4::operator/= (U s) diff --git a/glm/core/type_mat4x2.hpp b/glm/core/type_mat4x2.hpp index 00250389..6cf74f2d 100644 --- a/glm/core/type_mat4x2.hpp +++ b/glm/core/type_mat4x2.hpp @@ -136,8 +136,6 @@ namespace detail template GLM_FUNC_DECL tmat4x2& operator*= (U s); template - GLM_FUNC_DECL tmat4x2& operator*= (tmat4x2 const & m); - template GLM_FUNC_DECL tmat4x2& operator/= (U s); ////////////////////////////////////// diff --git a/glm/core/type_mat4x2.inl b/glm/core/type_mat4x2.inl index 6b3e8120..aa897dc7 100644 --- a/glm/core/type_mat4x2.inl +++ b/glm/core/type_mat4x2.inl @@ -401,13 +401,6 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tmat4x2 & tmat4x2::operator*= (tmat4x2 const & m) - { - return (*this = tmat4x2(*this * m)); - } - template template GLM_FUNC_QUALIFIER tmat4x2 & tmat4x2::operator/= (U s) diff --git a/glm/core/type_mat4x3.hpp b/glm/core/type_mat4x3.hpp index 76e71c7d..97657245 100644 --- a/glm/core/type_mat4x3.hpp +++ b/glm/core/type_mat4x3.hpp @@ -136,8 +136,6 @@ namespace detail template GLM_FUNC_DECL tmat4x3 & operator*= (U s); template - GLM_FUNC_DECL tmat4x3 & operator*= (tmat4x3 const & m); - template GLM_FUNC_DECL tmat4x3 & operator/= (U s); ////////////////////////////////////// diff --git a/glm/core/type_mat4x3.inl b/glm/core/type_mat4x3.inl index d43ebfcf..3de9aebe 100644 --- a/glm/core/type_mat4x3.inl +++ b/glm/core/type_mat4x3.inl @@ -401,13 +401,6 @@ namespace detail return *this; } - template - template - GLM_FUNC_QUALIFIER tmat4x3 & tmat4x3::operator*= (tmat4x3 const & m) - { - return (*this = tmat4x3(*this * m)); - } - template template GLM_FUNC_QUALIFIER tmat4x3 & tmat4x3::operator/= (U s)