mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Non-functional: Fix round of compiler warnings.

Browse Source
This commit is contained in:
John Kessenich 2017-01-13 20:08:54 -07:00
parent c142c88967
commit 442515393e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // 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). // 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" #define GLSLANG_DATE "13-Jan-2017"

2
glslang/MachineIndependent/Scan.cpp
View File

@ -721,7 +721,7 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
default: default:
char buf[2]; char buf[2];
buf[0] = token; buf[0] = (char)token;
buf[1] = 0; buf[1] = 0;
parseContext.error(loc, "unexpected token", buf, ""); parseContext.error(loc, "unexpected token", buf, "");
break; break;

2
glslang/MachineIndependent/preprocessor/Pp.cpp
View File

@ -968,7 +968,7 @@ int TPpContext::scanHeaderName(TPpToken* ppToken, char delimit)
// found a character to expand the name with // found a character to expand the name with
if (len < MaxTokenLength) if (len < MaxTokenLength)
ppToken->name[len++] = ch; ppToken->name[len++] = (char)ch;
else else
tooLong = true; tooLong = true;
} while (true); } while (true);

12
glslang/Public/ShaderLang.h
View File

@ -374,16 +374,16 @@ public:
// the C++ specification. // the C++ specification.
// For the "system" or <>-style includes; search the "system" paths. // For the "system" or <>-style includes; search the "system" paths.
virtual IncludeResult* includeSystem(const char* headerName, virtual IncludeResult* includeSystem(const char* /*headerName*/,
const char* includerName, const char* /*includerName*/,
size_t inclusionDepth) { return nullptr; } size_t /*inclusionDepth*/) { return nullptr; }
// For the "local"-only aspect of a "" include. Should not search in the // For the "local"-only aspect of a "" include. Should not search in the
// "system" paths, because on returning a failure, the parser will // "system" paths, because on returning a failure, the parser will
// call includeSystem() to look in the "system" locations. // call includeSystem() to look in the "system" locations.
virtual IncludeResult* includeLocal(const char* headerName, virtual IncludeResult* includeLocal(const char* /*headerName*/,
const char* includerName, const char* /*includerName*/,
size_t inclusionDepth) { return nullptr; } size_t /*inclusionDepth*/) { return nullptr; }
// Signals that the parser will no longer use the contents of the // Signals that the parser will no longer use the contents of the
// specified IncludeResult. // specified IncludeResult.