Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
We can use unordered_map without pain now!
  • Loading branch information
jordan-woyak committed Apr 2, 2013
1 parent f36e185 commit 4ba12be
Showing 1 changed file with 11 additions and 32 deletions.
43 changes: 11 additions & 32 deletions Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
Expand Up @@ -16,17 +16,7 @@
// http://code.google.com/p/dolphin-emu/

#include <algorithm>
#ifdef _MSC_VER
#include <hash_map>
using stdext::hash_map;
#elif defined __APPLE__
#include <ext/hash_map>
using __gnu_cxx::hash_map;
#else
#include <unordered_map>
using std::unordered_map;
#endif
#include <map>
#include <vector>

#include "VideoCommon.h"
Expand All @@ -41,32 +31,21 @@ static int s_attr_dirty; // bitfield

static VertexLoader *g_VertexLoaders[8];

#ifdef _MSC_VER
namespace stdext {
inline size_t hash_value(const VertexLoaderUID& uid) {
return uid.GetHash();
}
}
#else
#ifdef __APPLE__
namespace __gnu_cxx
#else
namespace std
#endif
{
template<> struct hash<VertexLoaderUID> {
size_t operator()(const VertexLoaderUID& uid) const {
return uid.GetHash();
}
};

template <>
struct hash<VertexLoaderUID>
{
size_t operator()(const VertexLoaderUID& uid) const
{
return uid.GetHash();
}
};

}
#endif

#if defined _MSC_VER || defined __APPLE__
typedef hash_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
#else
typedef unordered_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
#endif
typedef std::unordered_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;

namespace VertexLoaderManager
{
Expand Down

0 comments on commit 4ba12be

Please sign in to comment.