Merge branch 'stlport-removal' of bitbucket.org:anon/swg-src into stlport-removal

This commit is contained in:
Anonymous
2014-01-23 09:30:49 -07:00
71 changed files with 236 additions and 255 deletions
@@ -12,7 +12,7 @@
#include "sharedMath/Vector.h"
#include <tr1/unordered_map>
#include <unordered_map>
// ======================================================================
@@ -42,7 +42,7 @@ private:
private:
typedef std::tr1::unordered_multimap<uint32 /*crc*/, int /*index*/> VertexIndexMap;
typedef std::unordered_multimap<uint32 /*crc*/, int /*index*/> VertexIndexMap;
VectorVector * m_vertices;
VertexIndexMap * m_indexMap;