Skip to content

G
glslang
Unverified Commit a5152505 by John Kessenich Committed by GitHub
Options

Merge pull request #1269 from bkaradzic/master

Fixed GCC+Clang errors and warnings on Linux and OSX.
parents 9c82dd10 1e5c9463
Showing with 5 additions and 5 deletions
SPIRV/GlslangToSpv.h
...@@ -34,7 +34,7 @@ ...@@ -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
......
glslang/Include/Common.h
...@@ -51,7 +51,7 @@ ...@@ -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>
......
glslang/Include/intermediate.h
...@@ -47,7 +47,7 @@ ...@@ -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
......
hlsl/hlslParseHelper.cpp
...@@ -7520,8 +7520,8 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction ...@@ -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
......
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