From 46f67fce7a643c118a68b9aa02a14ae4262f73ac Mon Sep 17 00:00:00 2001
From: Ganael Laplanche <ganael.laplanche@martymac.org>
Date: Mon, 17 Jul 2017 14:49:51 +0200
Subject: [PATCH] Remove dependency to TR1.

TR1 will be deprecated in Boost 1.65, see:
https://github.com/boostorg/admin/issues/123
---
 simgear/scene/material/Effect.cxx | 6 +++---
 simgear/scene/material/Effect.hxx | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 <map>
 #include <queue>
 #include <utility>
-#include <boost/tr1/unordered_map.hpp>
+#include <unordered_map>
 
 #include <boost/bind.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
 
-typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>,
+typedef std::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 std::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
 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 <vector>
 #include <string>
-#include <boost/tr1/unordered_map.hpp>
+#include <unordered_map>
 
 #include <boost/functional/hash.hpp>
 
@@ -127,7 +127,7 @@ protected:
             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;
     Cache* getCache()
     {