From 06f084063fd6d9aa2ef6904517650700ae47b63d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 17 Dec 2016 19:47:11 +0100 Subject: [PATCH] Clean up GLM_STATIC_CONST_MEMBERS #591 --- glm/detail/type_mat4x2.inl | 7 ------- glm/detail/type_vec2.inl | 13 ------------- glm/detail/type_vec3.inl | 26 -------------------------- 3 files changed, 46 deletions(-) diff --git a/glm/detail/type_mat4x2.inl b/glm/detail/type_mat4x2.inl index 6d83229c..76e8ffaa 100644 --- a/glm/detail/type_mat4x2.inl +++ b/glm/detail/type_mat4x2.inl @@ -3,13 +3,6 @@ namespace glm { -# ifdef GLM_STATIC_CONST_MEMBERS - template - const tmat4x2 tmat4x2::ZERO(static_cast(0)); - - template - const tmat4x2 tmat4x2::IDENTITY(static_cast(1)); -# endif // -- Constructors -- # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl index ae372541..c7b2c1cb 100644 --- a/glm/detail/type_vec2.inl +++ b/glm/detail/type_vec2.inl @@ -3,19 +3,6 @@ namespace glm { -# ifdef GLM_STATIC_CONST_MEMBERS - template - const tvec2 tvec2::ZERO(static_cast(0), static_cast(0)); - - template - const tvec2 tvec2::X(static_cast(1), static_cast(0)); - - template - const tvec2 tvec2::Y(static_cast(0), static_cast(1)); - - template - const tvec2 tvec2::XY(static_cast(1), static_cast(1)); -# endif // -- Implicit basic constructors -- # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl index df9b2ad7..664554eb 100644 --- a/glm/detail/type_vec3.inl +++ b/glm/detail/type_vec3.inl @@ -3,32 +3,6 @@ namespace glm { - -# ifdef GLM_STATIC_CONST_MEMBERS - template - const tvec3 tvec3::ZERO(static_cast(0), static_cast(0), static_cast(0)); - - template - const tvec3 tvec3::X(static_cast(1), static_cast(0), static_cast(0)); - - template - const tvec3 tvec3::Y(static_cast(0), static_cast(1), static_cast(0)); - - template - const tvec3 tvec3::Z(static_cast(0), static_cast(0), static_cast(1)); - - template - const tvec3 tvec3::XY(static_cast(1), static_cast(1), static_cast(0)); - - template - const tvec3 tvec3::XZ(static_cast(1), static_cast(0), static_cast(1)); - - template - const tvec3 tvec3::YZ(static_cast(0), static_cast(1), static_cast(1)); - - template - const tvec3 tvec3::XYZ(static_cast(1), static_cast(1), static_cast(1)); -# endif // -- Implicit basic constructors -- # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)