Commit 8e1e717c by Johannes van Waveren

fixed MSVC 2015 compile warnings

parent e07c7038
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE //ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE. //POSSIBILITY OF SUCH DAMAGE.
#if _MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#endif
#include "../glslang/Include/intermediate.h" #include "../glslang/Include/intermediate.h"
#include <string> #include <string>
......
...@@ -81,6 +81,10 @@ inline long long int atoll (const char* str) ...@@ -81,6 +81,10 @@ 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>
......
...@@ -46,6 +46,11 @@ ...@@ -46,6 +46,11 @@
#ifndef __INTERMEDIATE_H #ifndef __INTERMEDIATE_H
#define __INTERMEDIATE_H #define __INTERMEDIATE_H
#if _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
#include "../Include/Common.h" #include "../Include/Common.h"
#include "../Include/Types.h" #include "../Include/Types.h"
#include "../Include/ConstantUnion.h" #include "../Include/ConstantUnion.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