commit cbd20d9de071350b6241d82ba9d70e82dba95150
author Nicolas Capens <capn@google.com> Tue Dec 19 00:07:50 2017 -0500
committer Nicolas Capens <nicolascapens@google.com> Tue Dec 19 05:09:27 2017 +0000
tree 83ba1215db78e71178b5f65b788a025b32733eaa
parent 4ddd5c5e421529930d76bc530294f66ed7a1fc85

Fix build issues.

Change-Id: I93171764df5e13a7a5be6a9116e1a5db1ed59ad5
Reviewed-on: https://swiftshader-review.googlesource.com/15268
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/compiler/ParseHelper.cpp

diff --git a/src/OpenGL/compiler/ParseHelper.cpp b/src/OpenGL/compiler/ParseHelper.cpp
index cb513de..0be554f 100644
--- a/src/OpenGL/compiler/ParseHelper.cpp
+++ b/src/OpenGL/compiler/ParseHelper.cpp
@@ -14,6 +14,7 @@
 
 #include "ParseHelper.h"
 
+#include <limits>
 #include <stdarg.h>
 #include <stdio.h>
 

src/OpenGL/compiler/preprocessor/ExpressionParser.cpp

diff --git a/src/OpenGL/compiler/preprocessor/ExpressionParser.cpp b/src/OpenGL/compiler/preprocessor/ExpressionParser.cpp
index ab561b8..25f38cb 100644
--- a/src/OpenGL/compiler/preprocessor/ExpressionParser.cpp
+++ b/src/OpenGL/compiler/preprocessor/ExpressionParser.cpp
@@ -105,6 +105,7 @@
 #include <stdlib.h>
 #endif
 
+#include <limits>
 #include <cassert>
 #include <sstream>
 #include <stdint.h>

src/OpenGL/compiler/preprocessor/ExpressionParser.y

diff --git a/src/OpenGL/compiler/preprocessor/ExpressionParser.y b/src/OpenGL/compiler/preprocessor/ExpressionParser.y
index af5abd8..5342935 100644
--- a/src/OpenGL/compiler/preprocessor/ExpressionParser.y
+++ b/src/OpenGL/compiler/preprocessor/ExpressionParser.y
@@ -55,6 +55,7 @@
 #include <stdlib.h>
 #endif
 
+#include <limits>
 #include <cassert>
 #include <sstream>
 #include <stdint.h>

src/OpenGL/libGLESv2/Program.cpp

diff --git a/src/OpenGL/libGLESv2/Program.cpp b/src/OpenGL/libGLESv2/Program.cpp
index d0bba34..5abf345 100644
--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -1665,7 +1665,7 @@
 			return attribute.location;
 		}
 
-		std::unordered_map<std::string, GLuint>::const_iterator it = linkedAttributeLocation.find(attribute.name);
+		std::map<std::string, GLuint>::const_iterator it = linkedAttributeLocation.find(attribute.name);
 		if(it != linkedAttributeLocation.end())
 		{
 			return it->second;