RPCS3/glslang
1
0
Fork 0
mirror of https://github.com/RPCS3/glslang.git synced 2025-03-04 16:47:13 +00:00
Code Issues Actions Packages 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
commit a51525059f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/GlslangToSpv.h
View File

@ -34,7 +34,7 @@
#pragma once #pragma once
#if _MSC_VER >= 1900 #if defined(_MSC_VER) && _MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..' #pragma warning(disable : 4464) // relative include path contains '..'
#endif #endif

2
glslang/Include/Common.h
View File

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

2
glslang/Include/intermediate.h
View File

@ -47,7 +47,7 @@
#ifndef __INTERMEDIATE_H #ifndef __INTERMEDIATE_H
#define __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 : 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

4
hlsl/hlslParseHelper.cpp
View File

@ -7520,8 +7520,8 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction
} }
}; };
return std::abs(linearize(to2.getBasicType()) - linearize(from.getBasicType())) < return abs(linearize(to2.getBasicType()) - linearize(from.getBasicType())) <
std::abs(linearize(to1.getBasicType()) - linearize(from.getBasicType())); abs(linearize(to1.getBasicType()) - linearize(from.getBasicType()));
}; };
// for ambiguity reporting // for ambiguity reporting