From 20daa7f64a3394a98deed5120d194eded477f7cf Mon Sep 17 00:00:00 2001
From: Lei Zhang <antiagainst@google.com>
Date: Tue, 10 May 2016 13:38:08 -0400
Subject: [PATCH] Use strtoul instead of stoul for Android.

---
 glslang/MachineIndependent/propagateNoContraction.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/glslang/MachineIndependent/propagateNoContraction.cpp b/glslang/MachineIndependent/propagateNoContraction.cpp
index ab00829b..24e47a74 100644
--- a/glslang/MachineIndependent/propagateNoContraction.cpp
+++ b/glslang/MachineIndependent/propagateNoContraction.cpp
@@ -39,6 +39,7 @@
 
 #include "propagateNoContraction.h"
 
+#include <cstdlib>
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -663,7 +664,7 @@ protected:
             // Gets the struct dereference index that leads to 'precise' object.
             ObjectAccessChain precise_accesschain_index_str =
                 getFrontElement(remained_accesschain_);
-            unsigned precise_accesschain_index = std::stoul(precise_accesschain_index_str);
+            unsigned precise_accesschain_index = strtoul(precise_accesschain_index_str.c_str(), nullptr, 10);
             // Gets the node pointed by the accesschain index extracted before.
             glslang::TIntermTyped* potential_precise_node =
                 node->getSequence()[precise_accesschain_index]->getAsTyped();