commit cd1db9e6c937a69f8efb5f73a3fcad14a737c436
author Jamie Madill <jmadill@chromium.org> Mon Jan 05 16:09:05 2015 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Jan 07 15:56:14 2015 +0000
tree b5156e2673ec3bcb53feb1b480255ad80df952cb
parent b78b42dd7688f6cc7f5437bae80066418f00cee5

Avoid using std::unordered_map on OSX.

This c++11 standard library class isn't available on Chromium/OSX.
For now we can replace it with std::map.

BUG=angle:773

Change-Id: I0b8ab0de5192a23408755d03df2b9f738f28d762
Reviewed-on: https://chromium-review.googlesource.com/238445
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/ResourceManager.h

diff --git a/src/libANGLE/ResourceManager.h b/src/libANGLE/ResourceManager.h
index f04a34c..8466c55 100644
--- a/src/libANGLE/ResourceManager.h
+++ b/src/libANGLE/ResourceManager.h
@@ -10,13 +10,12 @@
 #ifndef LIBANGLE_RESOURCEMANAGER_H_
 #define LIBANGLE_RESOURCEMANAGER_H_
 
+#include "angle_gl.h"
 #include "common/angleutils.h"
 #include "libANGLE/angletypes.h"
 #include "libANGLE/HandleAllocator.h"
 
-#include "angle_gl.h"
-
-#include <unordered_map>
+#include <map>
 
 namespace rx
 {
@@ -82,30 +81,30 @@
     rx::Renderer *mRenderer;
     std::size_t mRefCount;
 
-    typedef std::unordered_map<GLuint, Buffer*> BufferMap;
+    typedef std::map<GLuint, Buffer*> BufferMap;
     BufferMap mBufferMap;
     HandleAllocator mBufferHandleAllocator;
 
-    typedef std::unordered_map<GLuint, Shader*> ShaderMap;
+    typedef std::map<GLuint, Shader*> ShaderMap;
     ShaderMap mShaderMap;
 
-    typedef std::unordered_map<GLuint, Program*> ProgramMap;
+    typedef std::map<GLuint, Program*> ProgramMap;
     ProgramMap mProgramMap;
     HandleAllocator mProgramShaderHandleAllocator;
 
-    typedef std::unordered_map<GLuint, Texture*> TextureMap;
+    typedef std::map<GLuint, Texture*> TextureMap;
     TextureMap mTextureMap;
     HandleAllocator mTextureHandleAllocator;
 
-    typedef std::unordered_map<GLuint, Renderbuffer*> RenderbufferMap;
+    typedef std::map<GLuint, Renderbuffer*> RenderbufferMap;
     RenderbufferMap mRenderbufferMap;
     HandleAllocator mRenderbufferHandleAllocator;
 
-    typedef std::unordered_map<GLuint, Sampler*> SamplerMap;
+    typedef std::map<GLuint, Sampler*> SamplerMap;
     SamplerMap mSamplerMap;
     HandleAllocator mSamplerHandleAllocator;
 
-    typedef std::unordered_map<GLuint, FenceSync*> FenceMap;
+    typedef std::map<GLuint, FenceSync*> FenceMap;
     FenceMap mFenceSyncMap;
     HandleAllocator mFenceSyncHandleAllocator;
 };