Merge pull request #1269 from bkaradzic/master

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

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