瀏覽代碼

Fixed warnings

Christophe Riccio 10 年之前
父節點
當前提交
6aabe5a07d
共有 2 個文件被更改,包括 11 次插入10 次删除
  1. 10 10
      glm/detail/type_vec4.inl
  2. 1 0
      readme.md

+ 10 - 10
glm/detail/type_vec4.inl

@@ -341,12 +341,12 @@ namespace glm
 
 	template <typename T, precision P>
 	template <typename U>
-	GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator*=(U s)
+	GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator*=(U v)
 	{
-		this->x *= static_cast<T>(s);
-		this->y *= static_cast<T>(s);
-		this->z *= static_cast<T>(s);
-		this->w *= static_cast<T>(s);
+		this->x *= static_cast<T>(v);
+		this->y *= static_cast<T>(v);
+		this->z *= static_cast<T>(v);
+		this->w *= static_cast<T>(v);
 		return *this;
 	}
 
@@ -374,12 +374,12 @@ namespace glm
 
 	template <typename T, precision P>
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(U s)
+	GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(U v)
 	{
-		this->x /= static_cast<T>(s);
-		this->y /= static_cast<T>(s);
-		this->z /= static_cast<T>(s);
-		this->w /= static_cast<T>(s);
+		this->x /= static_cast<T>(v);
+		this->y /= static_cast<T>(v);
+		this->z /= static_cast<T>(v);
+		this->w /= static_cast<T>(v);
 		return *this;
 	}
 

+ 1 - 0
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: