From ec79dbdbefcd98c53d754619ed07149a23026543 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 10 Aug 2017 02:43:41 +0200 Subject: [PATCH] Disabled warnings --- CMakeLists.txt | 2 +- glm/detail/type_vec1.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96cfc151..db927024 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl index 0e701c97..6bce5d42 100644 --- a/glm/detail/type_vec1.inl +++ b/glm/detail/type_vec1.inl @@ -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(v.x << scalar)); } template