diff --git a/simgear/scene/material/Effect.cxx b/simgear/scene/material/Effect.cxx index 6f36c072..bfbc1412 100644 --- a/simgear/scene/material/Effect.cxx +++ b/simgear/scene/material/Effect.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include @@ -832,13 +832,13 @@ size_t hash_value(const ProgramKey& key) // XXX Should these be protected by a mutex? Probably -typedef tr1::unordered_map, +typedef std::unordered_map, boost::hash, ProgramKey::EqualTo> ProgramMap; ProgramMap programMap; ProgramMap resolvedProgramMap; // map with resolved shader file names -typedef tr1::unordered_map, boost::hash > +typedef std::unordered_map, boost::hash > ShaderMap; ShaderMap shaderMap; diff --git a/simgear/scene/material/Effect.hxx b/simgear/scene/material/Effect.hxx index 50ac5fb7..84a25222 100644 --- a/simgear/scene/material/Effect.hxx +++ b/simgear/scene/material/Effect.hxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include @@ -127,7 +127,7 @@ protected: bool operator()(const Key& lhs, const Key& rhs) const; }; }; - typedef std::tr1::unordered_map, + typedef std::unordered_map, boost::hash, Key::EqualTo> Cache; Cache* getCache() {