From 3d399aaaca3ef180992b42e657f3477d86593e63 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 7 Sep 2014 17:14:39 +0200 Subject: [PATCH] Remove useless std::move, #219 --- glm/detail/type_mat2x2.hpp | 10 ---------- glm/detail/type_mat2x3.hpp | 10 ---------- glm/detail/type_mat2x4.hpp | 10 ---------- glm/detail/type_mat3x2.hpp | 11 ----------- glm/detail/type_mat3x3.hpp | 11 ----------- glm/detail/type_mat3x4.hpp | 11 ----------- glm/detail/type_mat4x2.hpp | 12 ------------ glm/detail/type_mat4x3.hpp | 12 ------------ glm/detail/type_mat4x4.hpp | 12 ------------ 9 files changed, 99 deletions(-) diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index baa6288f..7a1fa10a 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -118,16 +118,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat2x2 & operator=(tmat2x2 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat2x2 & operator=(tmat2x2 const & m); template GLM_FUNC_DECL tmat2x2 & operator=(tmat2x2 const & m); diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index 6be15b34..7603c802 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -109,16 +109,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat2x3 & operator=(tmat2x3 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat2x3 & operator= (tmat2x3 const & m); template GLM_FUNC_DECL tmat2x3 & operator= (tmat2x3 const & m); diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 3c900278..c4da412c 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -111,16 +111,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat2x4 & operator=(tmat2x4 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat2x4& operator= (tmat2x4 const & m); template GLM_FUNC_DECL tmat2x4& operator= (tmat2x4 const & m); diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index f2c23f35..c06c7d3a 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -115,17 +115,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat3x2 & operator=(tmat3x2 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - this->value[2] = std::move(m.value[2]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat3x2 & operator= (tmat3x2 const & m); template GLM_FUNC_DECL tmat3x2 & operator= (tmat3x2 const & m); diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp index 82c595e7..d6bf7ef7 100644 --- a/glm/detail/type_mat3x3.hpp +++ b/glm/detail/type_mat3x3.hpp @@ -120,17 +120,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat3x3 & operator=(tmat3x3 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - this->value[2] = std::move(m.value[2]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat3x3& operator= (tmat3x3 const & m); template GLM_FUNC_DECL tmat3x3& operator= (tmat3x3 const & m); diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index af704eb9..a0faaa0e 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -115,17 +115,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat3x4 & operator=(tmat3x4 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - this->value[2] = std::move(m.value[2]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat3x4 & operator= (tmat3x4 const & m); template GLM_FUNC_DECL tmat3x4 & operator= (tmat3x4 const & m); diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index 2adc36fd..254da024 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -121,18 +121,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat4x2 & operator=(tmat4x2 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - this->value[2] = std::move(m.value[2]); - this->value[3] = std::move(m.value[3]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat4x2& operator= (tmat4x2 const & m); template GLM_FUNC_DECL tmat4x2& operator= (tmat4x2 const & m); diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 03103d77..b436a7c7 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -121,18 +121,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](size_type i); GLM_FUNC_DECL col_type const & operator[](size_type i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat4x3 & operator=(tmat4x3 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - this->value[2] = std::move(m.value[2]); - this->value[3] = std::move(m.value[3]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat4x3 & operator= (tmat4x3 const & m); template GLM_FUNC_DECL tmat4x3 & operator= (tmat4x3 const & m); diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index d5b24ba2..419042fc 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -120,18 +120,6 @@ namespace detail GLM_FUNC_DECL col_type & operator[](length_t i); GLM_FUNC_DECL col_type const & operator[](length_t i) const; - // Unary updatable operators -# if(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat4x4 & operator=(tmat4x4 && m) - { - this->value[0] = std::move(m.value[0]); - this->value[1] = std::move(m.value[1]); - this->value[2] = std::move(m.value[2]); - this->value[3] = std::move(m.value[3]); - return *this; - } -# endif//(GLM_HAS_DEFAULTED_FUNCTIONS && GLM_HAS_RVALUE_REFERENCES) - GLM_FUNC_DECL tmat4x4 & operator= (tmat4x4 const & m); template GLM_FUNC_DECL tmat4x4 & operator= (tmat4x4 const & m);