Clean up gcc/g++ compiler warnings that have accumulated.

This commit is contained in:
Glenn Rice
2012-12-10 00:40:28 -06:00
parent 43d673b576
commit e85438cba0
42 changed files with 82 additions and 106 deletions

View File

@ -20,8 +20,8 @@
#include <hash_map>
using stdext::hash_map;
#else
#include <ext/hash_map>
using __gnu_cxx::hash_map;
#include <unordered_map>
using std::unordered_map;
#endif
#include <map>
#include <vector>
@ -44,20 +44,21 @@ namespace stdext {
return uid.GetHash();
}
}
typedef hash_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
#else
namespace __gnu_cxx {
namespace std {
template<> struct hash<VertexLoaderUID> {
size_t operator()(const VertexLoaderUID& uid) const {
return uid.GetHash();
}
};
}
typedef unordered_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
#endif
namespace VertexLoaderManager
{
typedef hash_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
static VertexLoaderMap g_VertexLoaderMap;
// TODO - change into array of pointers. Keep a map of all seen so far.