From a25352eb4fe752c74552f54a436e6f98928d297f Mon Sep 17 00:00:00 2001 From: Dejan Mircevski Date: Thu, 5 May 2016 11:51:27 -0400 Subject: [PATCH] Use strtoll, as stoll is unavailable on Android. --- glslang/MachineIndependent/preprocessor/PpTokens.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glslang/MachineIndependent/preprocessor/PpTokens.cpp b/glslang/MachineIndependent/preprocessor/PpTokens.cpp index 95da3dbd..54d495e1 100644 --- a/glslang/MachineIndependent/preprocessor/PpTokens.cpp +++ b/glslang/MachineIndependent/preprocessor/PpTokens.cpp @@ -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; } }