From f6df3d15134def6845dfe74fa7d38d1d6688e5a5 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 10 Dec 2012 08:40:27 -0600 Subject: [PATCH] OSX build fix for the unordered_map/hash_map issue. --- .../Core/VideoCommon/Src/VertexLoaderManager.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp index 4afa6e941b..153e69a8c3 100644 --- a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp @@ -19,6 +19,9 @@ #ifdef _MSC_VER #include using stdext::hash_map; +#elif defined __APPLE__ +#include +using __gnu_cxx::hash_map; #else #include using std::unordered_map; @@ -44,15 +47,24 @@ namespace stdext { return uid.GetHash(); } } -typedef hash_map VertexLoaderMap; #else -namespace std { +#ifdef __APPLE__ +namespace __gnu_cxx +#else +namespace std +#endif +{ template<> struct hash { size_t operator()(const VertexLoaderUID& uid) const { return uid.GetHash(); } }; } +#endif + +#if defined _MSC_VER || defined __APPLE__ +typedef hash_map VertexLoaderMap; +#else typedef unordered_map VertexLoaderMap; #endif