Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / pool / PoolTraits.h

diff --git a/zypp/pool/PoolTraits.h b/zypp/pool/PoolTraits.h
index 816d2e9..5b2770b 100644 (file)
--- a/zypp/pool/PoolTraits.h
+++ b/zypp/pool/PoolTraits.h
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "zypp/base/Iterator.h"
-#include "zypp/base/Hash.h"
+#include "zypp/base/Tr1hash.h"
 
 #include "zypp/PoolItem.h"
 #include "zypp/pool/ByIdent.h"
@@ -45,15 +45,15 @@ namespace zypp
 
     /** In CXX0X std::_Select2nd does no longer derive from std::unary_function
      */
-    template<typename TPair>
-    struct P_Select2nd : public std::unary_function<TPair, typename TPair::second_type>
+    template<typename _Pair>
+    struct P_Select2nd : public std::unary_function<_Pair, typename _Pair::second_type>
     {
-      typename TPair::second_type&
-      operator()(TPair& __x) const
+      typename _Pair::second_type&
+      operator()(_Pair& __x) const
       { return __x.second; }
 
-      const typename TPair::second_type&
-      operator()(const TPair& __x) const
+      const typename _Pair::second_type&
+      operator()(const _Pair& __x) const
       { return __x.second; }
     };
 
@@ -75,7 +75,7 @@ namespace zypp
       typedef ItemContainerT::size_type                        size_type;
 
       /** ident index */
-      typedef std::unordered_multimap<sat::detail::IdType, PoolItem>
+      typedef std::tr1::unordered_multimap<sat::detail::IdType, PoolItem>
                                                         Id2ItemT;
       typedef P_Select2nd<Id2ItemT::value_type>         Id2ItemValueSelector;
       typedef transform_iterator<Id2ItemValueSelector, Id2ItemT::const_iterator>