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

glslang preprocassor: Fix operator precedence bug.
11f5fc04 · John Kessenich · b7cc3311 · 11f5fc04 · 11f5fc04
Commit 11f5fc04 authored May 07, 2015 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

spvIR.h SPIRV/spvIR.h +1 -1

PpTokens.cpp glslang/MachineIndependent/preprocessor/PpTokens.cpp +1 -1

No files found.
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -54,7 +54,7 @@

 #include <vector>
 #include <iostream>
-#include <cassert>
+#include <assert.h>

 namespace spv {


--- 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);