From 386cb5bfb2022bef850e22ab188774e82a880b32 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Wed, 15 Jun 2022 05:45:12 +0200 Subject: [PATCH] Mute some warnings --- libraries/glslang/glslang/Include/Common.h | 1 + libraries/glslang/glslang/MachineIndependent/Constant.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/libraries/glslang/glslang/Include/Common.h b/libraries/glslang/glslang/Include/Common.h index 9042a1aa2..4c59abe3f 100644 --- a/libraries/glslang/glslang/Include/Common.h +++ b/libraries/glslang/glslang/Include/Common.h @@ -99,6 +99,7 @@ std::string to_string(const T& val) { #endif #if defined(_MSC_VER) +#undef strdup #define strdup _strdup #endif diff --git a/libraries/glslang/glslang/MachineIndependent/Constant.cpp b/libraries/glslang/glslang/MachineIndependent/Constant.cpp index 5fc61dbb7..74bde5e90 100644 --- a/libraries/glslang/glslang/MachineIndependent/Constant.cpp +++ b/libraries/glslang/glslang/MachineIndependent/Constant.cpp @@ -42,6 +42,10 @@ #include #include +#ifdef _MSC_VER +#pragma warning(disable: 4146) // warning C4146: unary minus operator applied to unsigned type, result still unsigned +#endif + namespace { using namespace glslang;