FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dependency to TR1.

Browse Source 
TR1 will be deprecated in Boost 1.65, see:
https://github.com/boostorg/admin/issues/123
This commit is contained in:
Ganael Laplanche
2017-07-17 14:49:51 +02:00
parent 629e68428f
commit 46f67fce7a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/Effect.cxx
+3 -3
View File
@@ -32,7 +32,7 @@
#include <map> #include <map>
#include <queue> #include <queue>
#include <utility> #include <utility>
#include <boost/tr1/unordered_map.hpp> #include <unordered_map>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@@ -832,13 +832,13 @@ size_t hash_value(const ProgramKey& key)
// XXX Should these be protected by a mutex? Probably // XXX Should these be protected by a mutex? Probably
typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>, typedef std::unordered_map<ProgramKey, ref_ptr<Program>,
boost::hash<ProgramKey>, ProgramKey::EqualTo> boost::hash<ProgramKey>, ProgramKey::EqualTo>
ProgramMap; ProgramMap;
ProgramMap programMap; ProgramMap programMap;
ProgramMap resolvedProgramMap; // map with resolved shader file names ProgramMap resolvedProgramMap; // map with resolved shader file names
typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > typedef std::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
ShaderMap; ShaderMap;
ShaderMap shaderMap; ShaderMap shaderMap;
simgear/scene/material/Effect.hxx
+2 -2
View File
@@ -19,7 +19,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <boost/tr1/unordered_map.hpp> #include <unordered_map>
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
@@ -127,7 +127,7 @@ protected:
bool operator()(const Key& lhs, const Key& rhs) const; bool operator()(const Key& lhs, const Key& rhs) const;
}; };
}; };
typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>, typedef std::unordered_map<Key, osg::observer_ptr<Effect>,
boost::hash<Key>, Key::EqualTo> Cache; boost::hash<Key>, Key::EqualTo> Cache;
Cache* getCache() Cache* getCache()
{ {