Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Disabled warnings

Christophe Riccio 8 years ago
parent
36c196b195
commit
ec79dbdbef
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      CMakeLists.txt
  2. 1 1
      glm/detail/type_vec1.inl

+ 1 - 1
CMakeLists.txt
View File 

@@ -90,7 +90,7 @@ endif()
 
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
 	add_definitions(-Weverything -Wpedantic -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-documentation -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
 
-	add_definitions(-Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros)
 
+	add_definitions(-Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral)
 
 endif()
 
 
 option(GLM_TEST_ENABLE_LANG_EXTENSIONS "Enable language extensions" OFF)

+ 1 - 1
glm/detail/type_vec1.inl
View File 

@@ -478,7 +478,7 @@ namespace glm
 
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator<<(vec<1, T, P> const & v, T scalar)
 
 	{
 
 		return vec<1, T, P>(
 
-			v.x << scalar);
 
+			static_cast<T>(v.x << scalar));
 
 	}
 
 
 	template<typename T, precision P>