diff --git a/glm/ext/scalar_ulp.inl b/glm/ext/scalar_ulp.inl index 9858dc0580..716528d0cf 100644 --- a/glm/ext/scalar_ulp.inl +++ b/glm/ext/scalar_ulp.inl @@ -13,6 +13,7 @@ #if GLM_COMPILER & GLM_COMPILER_VC # pragma warning(push) # pragma warning(disable : 4127) +# pragma warning(disable : 4365) // '=': signed/unsigned mismatch #elif GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wsign-conversion" diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl index 70f80991c6..17927607fc 100644 --- a/glm/gtc/packing.inl +++ b/glm/gtc/packing.inl @@ -650,7 +650,7 @@ namespace detail detail::u9u9u9e5 Unpack; Unpack.pack = v; - return vec3(Unpack.data.x, Unpack.data.y, Unpack.data.z) * pow(2.0f, Unpack.data.w - 15.f - 9.f); + return vec3(Unpack.data.x, Unpack.data.y, Unpack.data.z) * pow(2.0f, static_cast(Unpack.data.w) - 15.f - 9.f); } // Based on Brian Karis http://graphicrants.blogspot.fr/2009/04/rgbm-color-encoding.html diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3401d2b823..59b90fafa2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -39,6 +39,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if(NOT GLM_DISABLE_AUTO_DETECTION) add_compile_options(/Wall /WX) + add_compile_options(/wd4464) # warning C4464: relative include path contains '..' + add_compile_options(/wd4514) # warning C4514: unreferenced inline function has been removed + add_compile_options(/wd4365) # warning C4365: signed/unsigned mismatch + add_compile_options(/wd5045) # warning C5045: Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified + add_compile_options(/wd5029) # warning C5029: nonstandard extension used: alignment attributes in C++ apply to variables, data members and tag types only + add_compile_options(/wd4820) # warning C4820: 'test_decl::S1': '3' bytes padding added after data member 'test_decl::S1::A' endif() # add_compile_options(/wd4309 /wd4324 /wd4389 /wd4127 /wd4267 /wd4146 /wd4201 /wd4464 /wd4514 /wd4701 /wd4820 /wd4365) add_definitions(-D_CRT_SECURE_NO_WARNINGS)