commit 9b8f92ea05957ca90bbff3fe4c56e8ec7772b131
author Geoff Lang <geofflang@google.com> Tue Jul 30 15:23:30 2013 -0400
committer Geoff Lang <geofflang@google.com> Fri Aug 02 15:45:32 2013 -0400
tree 03dfc708a896c78e4c5ab986a326aa6ea433ed37
parent ea2286352f5eba47dfaa3e9ab418bbacfd1ba8a1

Remove uses of the HASH_MAP define since unordered_map is already used in several places.

TRAC #23618

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Geoff Lang

src/libGLESv2/ResourceManager.h

diff --git a/src/libGLESv2/ResourceManager.h b/src/libGLESv2/ResourceManager.h
index e16a7a4..3bd6cad 100644
--- a/src/libGLESv2/ResourceManager.h
+++ b/src/libGLESv2/ResourceManager.h
@@ -14,11 +14,7 @@
 #include <GLES3/gl3.h>
 #include <GLES2/gl2.h>
 
-#ifdef _MSC_VER
-#include <hash_map>
-#else
 #include <unordered_map>
-#endif
 
 #include "common/angleutils.h"
 #include "libGLESv2/angletypes.h"
@@ -87,37 +83,31 @@
     std::size_t mRefCount;
     rx::Renderer *mRenderer;
 
-#ifndef HASH_MAP
-# ifdef _MSC_VER
-#  define HASH_MAP stdext::hash_map
-# else
-#  define HASH_MAP std::unordered_map
-# endif
-#endif
-
-    typedef HASH_MAP<GLuint, Buffer*> BufferMap;
+    typedef std::unordered_map<GLuint, Buffer*> BufferMap;
     BufferMap mBufferMap;
     HandleAllocator mBufferHandleAllocator;
 
-    typedef HASH_MAP<GLuint, Shader*> ShaderMap;
+    typedef std::unordered_map<GLuint, Shader*> ShaderMap;
     ShaderMap mShaderMap;
 
-    typedef HASH_MAP<GLuint, Program*> ProgramMap;
+    typedef std::unordered_map<GLuint, Program*> ProgramMap;
     ProgramMap mProgramMap;
     HandleAllocator mProgramShaderHandleAllocator;
 
-    typedef HASH_MAP<GLuint, Texture*> TextureMap;
+    typedef std::unordered_map<GLuint, Texture*> TextureMap;
     TextureMap mTextureMap;
     HandleAllocator mTextureHandleAllocator;
 
-    typedef HASH_MAP<GLuint, Renderbuffer*> RenderbufferMap;
+    typedef std::unordered_map<GLuint, Renderbuffer*> RenderbufferMap;
     RenderbufferMap mRenderbufferMap;
     HandleAllocator mRenderbufferHandleAllocator;
 
-    HASH_MAP<GLuint, Sampler*> mSamplerMap;
+    typedef std::unordered_map<GLuint, Sampler*> SamplerMap;
+    SamplerMap mSamplerMap;
     HandleAllocator mSamplerHandleAllocator;
 
-    HASH_MAP<GLuint, FenceSync*> mFenceSyncMap;
+    typedef std::unordered_map<GLuint, FenceSync*> FenceMap;
+    FenceMap mFenceSyncMap;
     HandleAllocator mFenceSyncHandleAllocator;
 };