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>

diff --git a/src/OpenGL/compiler/ParseHelper.cpp b/src/OpenGL/compiler/ParseHelper.cpp
index cb513de..0be554f 100644 (file)
--- 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>
 

diff --git a/src/OpenGL/compiler/preprocessor/ExpressionParser.cpp b/src/OpenGL/compiler/preprocessor/ExpressionParser.cpp
index ab561b8..25f38cb 100644 (file)
--- 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>

diff --git a/src/OpenGL/compiler/preprocessor/ExpressionParser.y b/src/OpenGL/compiler/preprocessor/ExpressionParser.y
index af5abd8..5342935 100644 (file)
--- a/src/OpenGL/compiler/preprocessor/ExpressionParser.y
+++ b/src/OpenGL/compiler/preprocessor/ExpressionParser.y
@@ -55,6 +55,7 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser.
 #include <stdlib.h>
 #endif
 
+#include <limits>
 #include <cassert>
 #include <sstream>
 #include <stdint.h>

diff --git a/src/OpenGL/libGLESv2/Program.cpp b/src/OpenGL/libGLESv2/Program.cpp
index d0bba34..5abf345 100644 (file)
--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -1665,7 +1665,7 @@ namespace es2
                        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;