diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index a7ec5471..bacfd0ab 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1766" +#define GLSLANG_REVISION "Overload400-PrecQual.1769" #define GLSLANG_DATE "13-Jan-2017" diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp index d2f72844..0e64364e 100644 --- a/glslang/MachineIndependent/Scan.cpp +++ b/glslang/MachineIndependent/Scan.cpp @@ -721,7 +721,7 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token) default: char buf[2]; - buf[0] = token; + buf[0] = (char)token; buf[1] = 0; parseContext.error(loc, "unexpected token", buf, ""); break; diff --git a/glslang/MachineIndependent/preprocessor/Pp.cpp b/glslang/MachineIndependent/preprocessor/Pp.cpp index 49c78ef8..abce3b56 100644 --- a/glslang/MachineIndependent/preprocessor/Pp.cpp +++ b/glslang/MachineIndependent/preprocessor/Pp.cpp @@ -968,7 +968,7 @@ int TPpContext::scanHeaderName(TPpToken* ppToken, char delimit) // found a character to expand the name with if (len < MaxTokenLength) - ppToken->name[len++] = ch; + ppToken->name[len++] = (char)ch; else tooLong = true; } while (true); diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h index 60e539b4..6c3fb11c 100644 --- a/glslang/Public/ShaderLang.h +++ b/glslang/Public/ShaderLang.h @@ -374,16 +374,16 @@ public: // the C++ specification. // For the "system" or <>-style includes; search the "system" paths. - virtual IncludeResult* includeSystem(const char* headerName, - const char* includerName, - size_t inclusionDepth) { return nullptr; } + virtual IncludeResult* includeSystem(const char* /*headerName*/, + const char* /*includerName*/, + size_t /*inclusionDepth*/) { return nullptr; } // For the "local"-only aspect of a "" include. Should not search in the // "system" paths, because on returning a failure, the parser will // call includeSystem() to look in the "system" locations. - virtual IncludeResult* includeLocal(const char* headerName, - const char* includerName, - size_t inclusionDepth) { return nullptr; } + virtual IncludeResult* includeLocal(const char* /*headerName*/, + const char* /*includerName*/, + size_t /*inclusionDepth*/) { return nullptr; } // Signals that the parser will no longer use the contents of the // specified IncludeResult.