Fix the few non-portable uses of "char" (where a -1 might be relevant): All uses of char are now either "int", "unsigned char" or char arrays for storing strings. Also, went to consistent "char* foo" coding convention. (There were only a few ambiguous uses.)
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25400 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
52c351442c
commit
51cdd90fa8
15 changed files with 72 additions and 72 deletions
|
|
@ -9,5 +9,5 @@
|
|||
// source have to figure out how to create revision.h just to get a build
|
||||
// going. However, if it is not updated, it can be a version behind.
|
||||
|
||||
#define GLSLANG_REVISION "25351"
|
||||
#define GLSLANG_DATE "2014/02/13 12:14:33"
|
||||
#define GLSLANG_REVISION "25392"
|
||||
#define GLSLANG_DATE "2014/02/18 14:55:42"
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ namespace glslang {
|
|||
// read past any white space
|
||||
void TInputScanner::consumeWhiteSpace(bool& foundNonSpaceTab)
|
||||
{
|
||||
char c = peek(); // don't accidentally consume anything other than whitespace
|
||||
int c = peek(); // don't accidentally consume anything other than whitespace
|
||||
while (c == ' ' || c == '\t' || c == '\r' || c == '\n') {
|
||||
if (c == '\r' || c == '\n')
|
||||
foundNonSpaceTab = true;
|
||||
|
|
@ -72,7 +72,7 @@ bool TInputScanner::consumeComment()
|
|||
return false;
|
||||
|
||||
get(); // consume the '/'
|
||||
char c = peek();
|
||||
int c = peek();
|
||||
if (c == '/') {
|
||||
|
||||
// a '//' style comment
|
||||
|
|
@ -139,7 +139,7 @@ void TInputScanner::consumeWhitespaceComment(bool& foundNonSpaceTab)
|
|||
consumeWhiteSpace(foundNonSpaceTab);
|
||||
|
||||
// if not starting a comment now, then done
|
||||
char c = peek();
|
||||
int c = peek();
|
||||
if (c != '/' || c < 0)
|
||||
return;
|
||||
|
||||
|
|
@ -176,7 +176,7 @@ bool TInputScanner::scanVersion(int& version, EProfile& profile)
|
|||
return true;
|
||||
|
||||
// whitespace
|
||||
char c;
|
||||
int c;
|
||||
do {
|
||||
c = get();
|
||||
} while (c == ' ' || c == '\t');
|
||||
|
|
|
|||
|
|
@ -62,12 +62,12 @@ public:
|
|||
// anything else is the next character
|
||||
|
||||
// retrieve the next character and advance one character
|
||||
char get()
|
||||
int get()
|
||||
{
|
||||
if (currentSource >= numSources)
|
||||
return -1;
|
||||
|
||||
char ret = sources[currentSource][currentChar];
|
||||
int ret = sources[currentSource][currentChar];
|
||||
if (ret == '\n')
|
||||
++loc[currentSource].line;
|
||||
advance();
|
||||
|
|
@ -76,7 +76,7 @@ public:
|
|||
}
|
||||
|
||||
// retrieve the next character, no advance
|
||||
char peek()
|
||||
int peek()
|
||||
{
|
||||
if (currentSource >= numSources)
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *ppToken)
|
|||
{
|
||||
char tokenText[TPpToken::maxTokenLength + 1];
|
||||
int ltoken, len;
|
||||
char ch;
|
||||
int ch;
|
||||
|
||||
ltoken = lReadByte(pTok);
|
||||
ppToken->loc = parseContext.getCurrentLoc();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue