Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / PoolItemBest.h

diff --git a/zypp/PoolItemBest.h b/zypp/PoolItemBest.h
index cf448da..44236c6 100644 (file)
--- a/zypp/PoolItemBest.h
+++ b/zypp/PoolItemBest.h
@@ -17,7 +17,7 @@
 #include "zypp/base/PtrTypes.h"
 #include "zypp/base/Function.h"
 #include "zypp/base/Iterator.h"
-#include "zypp/base/Hash.h"
+#include "zypp/base/Tr1hash.h"
 
 #include "zypp/PoolItem.h"
 
@@ -59,7 +59,7 @@ namespace zypp
    */
   class PoolItemBest
   {
-      typedef std::unordered_map<IdString,PoolItem> Container;
+      typedef std::tr1::unordered_map<IdString,PoolItem> Container;
     public:
       /** Predicate returning \c True if \a lhs is a better choice. */
       typedef boost::function<bool ( const PoolItem & lhs, const PoolItem & rhs )> Predicate;
@@ -83,8 +83,8 @@ namespace zypp
       { _ctor_init(); add( pi_r ); }
 
       /** Ctor feeding a range of  \ref sat::Solvable or \ref PoolItem. */
-      template<class TIterator>
-      PoolItemBest( TIterator begin_r, TIterator end_r )
+      template<class _Iterator>
+      PoolItemBest( _Iterator begin_r, _Iterator end_r )
       { _ctor_init(); add( begin_r, end_r ); }
 
     public:
@@ -96,8 +96,8 @@ namespace zypp
       void add( const PoolItem & pi_r );
 
       /** Feed a range of  \ref sat::Solvable or \ref PoolItem. */
-      template<class TIterator>
-      void add( TIterator begin_r, TIterator end_r )
+      template<class _Iterator>
+      void add( _Iterator begin_r, _Iterator end_r )
       {
         for_( it, begin_r, end_r )
           add( *it );