forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-games/simgear: Fix boost TR1 header include
Closes: https://bugs.gentoo.org/630234 Package-Manager: Portage-2.3.8, Repoman-2.3.3
- Loading branch information
1 parent
4f719a7
commit 4535ab5
Showing
2 changed files
with
58 additions
and
6 deletions.
There are no files selected for viewing
47 changes: 47 additions & 0 deletions
47
dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
--- a/simgear/scene/material/Effect.cxx | ||
+++ b/simgear/scene/material/Effect.cxx | ||
@@ -32,7 +32,7 @@ | ||
#include <map> | ||
#include <queue> | ||
#include <utility> | ||
-#include <boost/tr1/unordered_map.hpp> | ||
+#include <boost/unordered_map.hpp> | ||
|
||
#include <boost/bind.hpp> | ||
#include <boost/foreach.hpp> | ||
@@ -832,13 +832,13 @@ | ||
|
||
// XXX Should these be protected by a mutex? Probably | ||
|
||
-typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>, | ||
+typedef boost::unordered_map<ProgramKey, ref_ptr<Program>, | ||
boost::hash<ProgramKey>, ProgramKey::EqualTo> | ||
ProgramMap; | ||
ProgramMap programMap; | ||
ProgramMap resolvedProgramMap; // map with resolved shader file names | ||
|
||
-typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > | ||
+typedef boost::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > | ||
ShaderMap; | ||
ShaderMap shaderMap; | ||
|
||
--- a/simgear/scene/material/Effect.hxx | ||
+++ b/simgear/scene/material/Effect.hxx | ||
@@ -19,7 +19,7 @@ | ||
|
||
#include <vector> | ||
#include <string> | ||
-#include <boost/tr1/unordered_map.hpp> | ||
+#include <boost/unordered_map.hpp> | ||
|
||
#include <boost/functional/hash.hpp> | ||
|
||
@@ -127,7 +127,7 @@ | ||
bool operator()(const Key& lhs, const Key& rhs) const; | ||
}; | ||
}; | ||
- typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>, | ||
+ typedef boost::unordered_map<Key, osg::observer_ptr<Effect>, | ||
boost::hash<Key>, Key::EqualTo> Cache; | ||
Cache* getCache() | ||
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters