mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Johannes van Waveren 2016-10-21 17:30:50 +09:00
parent 2f4c832d47
commit d1300753f7
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/Include/Common.h
View File

@ -85,10 +85,6 @@ inline long long int atoll (const char* str)
#pragma warning(disable : 4201) // nameless union #pragma warning(disable : 4201) // nameless union
#endif #endif
#if _MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#endif
#include <set> #include <set>
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>

4
glslang/Include/intermediate.h
View File

@ -47,8 +47,8 @@
#define __INTERMEDIATE_H #define __INTERMEDIATE_H
#if _MSC_VER >= 1900 #if _MSC_VER >= 1900
#pragma warning( disable : 4464 ) // relative include path contains '..' #pragma warning(disable : 4464) // relative include path contains '..'
#pragma warning( disable : 5026 ) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted #pragma warning(disable : 5026) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted
#endif #endif
#include "../Include/Common.h" #include "../Include/Common.h"