Merge branch 'vs2013_compile_fix_dang' into 'master'

Fix a compile error on VS2013 when including from a project that includes window… …s.h and does not define NOMINMAX (http://stackoverflow.com/questions/2789481/problem-calling-stdmax) 1>h:\dev\source2\main\src\thirdparty\glslang\glslang\include\intermediate.h(908): error C2589: '(' : illegal token on right side of '::' (vulkan\renderdevicevulkan.cpp) 1>h:\dev\source2\main\src\thirdparty\glslang\glslang\include\intermediate.h(908): error C2059: syntax error : '::' (vulkan\renderdevicevulkan.cpp) See merge request !8

Merge branch 'vs2013_compile_fix_dang' into 'master'
32894b28 · John Kessenich · b9fc6c3b · b3266434 · 32894b28
Commit 32894b28 authored Dec 08, 2015 by John Kessenich
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

intermediate.h glslang/Include/intermediate.h +1 -1

No files found.
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -905,7 +905,7 @@ public:
    void incrementDepth(TIntermNode *current)
    {
        depth++;
-        maxDepth = std::max(maxDepth, depth);
+        maxDepth = (std::max)(maxDepth, depth);
        path.push_back(current);
    }