Skip to content

G
glslang
Commit d1300753 by Johannes van Waveren
Options

update

parent 2f4c832d
Showing with 2 additions and 6 deletions
glslang/Include/Common.h
...@@ -85,10 +85,6 @@ inline long long int atoll (const char* str) ...@@ -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>
......
glslang/Include/intermediate.h
...@@ -47,8 +47,8 @@ ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment