From 6aabe5a07dff7046970ab7bb32fd20dad385f664 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 31 Aug 2015 18:13:46 +0200 Subject: [PATCH] Fixed warnings --- glm/detail/type_vec4.inl | 20 ++++++++++---------- readme.md | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 27391693..8b680dd4 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -341,12 +341,12 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator*=(U s) + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator*=(U v) { - this->x *= static_cast(s); - this->y *= static_cast(s); - this->z *= static_cast(s); - this->w *= static_cast(s); + this->x *= static_cast(v); + this->y *= static_cast(v); + this->z *= static_cast(v); + this->w *= static_cast(v); return *this; } @@ -374,12 +374,12 @@ namespace glm template template - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator/=(U s) + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator/=(U v) { - this->x /= static_cast(s); - this->y /= static_cast(s); - this->z /= static_cast(s); - this->w /= static_cast(s); + this->x /= static_cast(v); + this->y /= static_cast(v); + this->z /= static_cast(v); + this->w /= static_cast(v); return *this; } diff --git a/readme.md b/readme.md index d7fe262c..f90bb5cb 100644 --- a/readme.md +++ b/readme.md @@ -56,6 +56,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Fixes: - Fixed link errors on compilers not supported default function #377 +- Fixed compilation warnings in vec4 #### [GLM 0.9.7.0](https://github.com/g-truc/glm/releases/tag/0.9.7.0) - 2015-08-02 ##### Features: