glslang preprocassor: Fix operator precedence bug.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31087 e7fa87d3-cd2b-0410-9028-fcbf551c1848

diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h
index 91a434f..c16df10 100644 (file)
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -54,7 +54,7 @@
 \r
 #include <vector>\r
 #include <iostream>\r
-#include <cassert>\r
+#include <assert.h>\r
 \r
 namespace spv {\r
 \r

diff --git a/glslang/MachineIndependent/preprocessor/PpTokens.cpp b/glslang/MachineIndependent/preprocessor/PpTokens.cpp
index 56cbbe7..b7cc0d3 100644 (file)
--- a/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+++ b/glslang/MachineIndependent/preprocessor/PpTokens.cpp
@@ -221,7 +221,7 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *ppToken)
         case CPP_UINTCONSTANT:
             strcpy(ppToken->name, tokenText);
             if (len > 0 && tokenText[0] == '0') {
-                if (len > 1 && tokenText[1] == 'x' || tokenText[1] == 'X')
+                if (len > 1 && (tokenText[1] == 'x' || tokenText[1] == 'X'))
                     ppToken->ival = strtol(ppToken->name, 0, 16);
                 else
                     ppToken->ival = strtol(ppToken->name, 0, 8);