From 838bdee3c3adca9de1c351edc5eea372886eea45 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 10 Nov 2014 00:04:47 +0100 Subject: [PATCH] All *vec* types are copyable #263 --- glm/detail/type_vec1.hpp | 3 --- glm/detail/type_vec1.inl | 12 ------------ glm/detail/type_vec2.hpp | 3 --- glm/detail/type_vec2.inl | 15 +-------------- glm/detail/type_vec3.hpp | 3 --- glm/detail/type_vec3.inl | 14 -------------- glm/detail/type_vec4.hpp | 3 --- 7 files changed, 1 insertion(+), 52 deletions(-) diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index ab8db882..ba6372d3 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -102,7 +102,6 @@ namespace glm // Implicit basic constructors GLM_FUNC_DECL tvec1(); - GLM_FUNC_DECL tvec1(tvec1 const & v); template GLM_FUNC_DECL tvec1(tvec1 const & v); @@ -142,8 +141,6 @@ namespace glm ////////////////////////////////////// // Unary arithmetic operators - GLM_FUNC_DECL tvec1 & operator=(tvec1 const & v); - template GLM_FUNC_DECL tvec1 & operator=(tvec1 const & v); template diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl index d4c5cff2..6932c6dd 100644 --- a/glm/detail/type_vec1.inl +++ b/glm/detail/type_vec1.inl @@ -69,11 +69,6 @@ namespace glm # endif {} - template - GLM_FUNC_QUALIFIER tvec1::tvec1(tvec1 const & v) - : x(v.x) - {} - template template GLM_FUNC_QUALIFIER tvec1::tvec1(tvec1 const & v) @@ -122,13 +117,6 @@ namespace glm ////////////////////////////////////// // Unary arithmetic operators - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator=(tvec1 const & v) - { - this->x = v.x; - return *this; - } - template template GLM_FUNC_QUALIFIER tvec1 & tvec1::operator=(tvec1 const & v) diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 5817a2f6..e3d77690 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -104,7 +104,6 @@ namespace glm // Implicit basic constructors GLM_FUNC_DECL tvec2(); - GLM_FUNC_DECL tvec2(tvec2 const & v); template GLM_FUNC_DECL tvec2(tvec2 const & v); @@ -151,8 +150,6 @@ namespace glm ////////////////////////////////////// // Unary arithmetic operators - GLM_FUNC_DECL tvec2 & operator=(tvec2 const & v); - template GLM_FUNC_DECL tvec2 & operator=(tvec2 const & v); template diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl index 7c5eb0b9..9a2326a8 100644 --- a/glm/detail/type_vec2.inl +++ b/glm/detail/type_vec2.inl @@ -64,16 +64,11 @@ namespace glm template GLM_FUNC_QUALIFIER tvec2::tvec2() -# ifndef GLM_FORCE_NO_CTOR_INIT +# ifndef GLM_FORCE_NO_CTOR_INIT : x(0), y(0) # endif {} - template - GLM_FUNC_QUALIFIER tvec2::tvec2(tvec2 const & v) - : x(v.x), y(v.y) - {} - template template GLM_FUNC_QUALIFIER tvec2::tvec2(tvec2 const & v) @@ -141,14 +136,6 @@ namespace glm ////////////////////////////////////// // Unary arithmetic operators - template - GLM_FUNC_QUALIFIER tvec2 & tvec2::operator=(tvec2 const & v) - { - this->x = v.x; - this->y = v.y; - return *this; - } - template template GLM_FUNC_QUALIFIER tvec2 & tvec2::operator=(tvec2 const & v) diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index 920d8acb..a8abb062 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -105,7 +105,6 @@ namespace glm // Implicit basic constructors GLM_FUNC_DECL tvec3(); - GLM_FUNC_DECL tvec3(tvec3 const & v); template GLM_FUNC_DECL tvec3(tvec3 const & v); @@ -173,8 +172,6 @@ namespace glm ////////////////////////////////////// // Unary arithmetic operators - GLM_FUNC_DECL tvec3 & operator=(tvec3 const & v); - template GLM_FUNC_DECL tvec3 & operator=(tvec3 const & v); template diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl index 6eb56791..75459d7b 100644 --- a/glm/detail/type_vec3.inl +++ b/glm/detail/type_vec3.inl @@ -69,11 +69,6 @@ namespace glm # endif {} - template - GLM_FUNC_QUALIFIER tvec3::tvec3(tvec3 const & v) - : x(v.x), y(v.y), z(v.z) - {} - template template GLM_FUNC_QUALIFIER tvec3::tvec3(tvec3 const & v) @@ -170,15 +165,6 @@ namespace glm ////////////////////////////////////// // Unary arithmetic operators - template - GLM_FUNC_QUALIFIER tvec3& tvec3::operator=(tvec3 const & v) - { - this->x = v.x; - this->y = v.y; - this->z = v.z; - return *this; - } - template template GLM_FUNC_QUALIFIER tvec3& tvec3::operator=(tvec3 const & v) diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 13da72b5..27cafa33 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -148,7 +148,6 @@ namespace detail // Implicit basic constructors GLM_FUNC_DECL tvec4(); - //GLM_FUNC_DECL tvec4(tvec4 const & v); template GLM_FUNC_DECL tvec4(tvec4 const & v); @@ -259,8 +258,6 @@ namespace detail ////////////////////////////////////// // Unary arithmetic operators - //GLM_FUNC_DECL tvec4 & operator=(tvec4 const & v); - template GLM_FUNC_DECL tvec4 & operator=(tvec4 const & v); template