From d1300753f723925bdf2706ad038c067fd88ec728 Mon Sep 17 00:00:00 2001 From: Johannes van Waveren Date: Fri, 21 Oct 2016 17:30:50 +0900 Subject: [PATCH] update --- glslang/Include/Common.h | 4 ---- glslang/Include/intermediate.h | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h index 6a695d09b..e082356cc 100644 --- a/glslang/Include/Common.h +++ b/glslang/Include/Common.h @@ -85,10 +85,6 @@ inline long long int atoll (const char* str) #pragma warning(disable : 4201) // nameless union #endif -#if _MSC_VER >= 1900 - #pragma warning(disable : 4464) // relative include path contains '..' -#endif - #include #include #include diff --git a/glslang/Include/intermediate.h b/glslang/Include/intermediate.h index 397a83260..db61b7507 100644 --- a/glslang/Include/intermediate.h +++ b/glslang/Include/intermediate.h @@ -47,8 +47,8 @@ #define __INTERMEDIATE_H #if _MSC_VER >= 1900 - #pragma warning( disable : 4464 ) // relative include path contains '..' - #pragma warning( disable : 5026 ) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted + #pragma warning(disable : 4464) // relative include path contains '..' + #pragma warning(disable : 5026) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted #endif #include "../Include/Common.h"