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

Merge pull request #266 from dekimir/kfixstoll

Browse Source 
Use strtoll, as stoll is unavailable on Android.
This commit is contained in:
John Kessenich 2016-05-05 12:59:56 -06:00
commit 076879d61c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glslang/MachineIndependent/preprocessor/PpTokens.cpp
View File

@ -235,11 +235,11 @@ int TPpContext::ReadToken(TokenStream *pTok, TPpToken *ppToken)
case PpAtomConstUint64:
if (len > 0 && tokenText[0] == '0') {
if (len > 1 && (tokenText[1] == 'x' || tokenText[1] == 'X'))
ppToken->i64val = std::stoll(ppToken->name, 0, 16);
ppToken->i64val = strtoll(ppToken->name, nullptr, 16);
else
ppToken->i64val = std::stoll(ppToken->name, 0, 8);
ppToken->i64val = strtoll(ppToken->name, nullptr, 8);
} else
ppToken->i64val = std::stoll(ppToken->name);
ppToken->i64val = atoll(ppToken->name);
break;
}
}