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

Merge pull request #1269 from bkaradzic/master

Browse Source 
Fixed GCC+Clang errors and warnings on Linux and OSX.
This commit is contained in:
John Kessenich
2018-03-07 14:31:57 -07:00
committed by GitHub
parent 9c82dd10cf 1e5c946326
commit a51525059f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/Common.h
View File

@@ -51,7 +51,7 @@
#define UINT_PTR uintptr_t
#endif
#if defined(__ANDROID__) || _MSC_VER < 1700
#if defined(__ANDROID__) || (defined(_MSC_VER) && _MSC_VER < 1700)
#include <sstream>
namespace std {
template<typename T>

2
glslang/Include/intermediate.h
View File

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