Imported Upstream version 16.3.2

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

diff --git a/zypp/PoolQueryResult.h b/zypp/PoolQueryResult.h
index fded69a..6c8237f 100644 (file)
--- a/zypp/PoolQueryResult.h
+++ b/zypp/PoolQueryResult.h
@@ -14,7 +14,7 @@
 
 #include <iosfwd>
 
-#include "zypp/base/Tr1hash.h"
+#include "zypp/base/Hash.h"
 #include "zypp/base/Exception.h"
 #include "zypp/sat/SolvIterMixin.h"
 
@@ -72,10 +72,10 @@ namespace zypp
    *   MIL << result << endl;
    * \endcode
    */
-  class PoolQueryResult : public sat::SolvIterMixin<PoolQueryResult,std::tr1::unordered_set<sat::Solvable>::const_iterator>
+  class PoolQueryResult : public sat::SolvIterMixin<PoolQueryResult,std::unordered_set<sat::Solvable>::const_iterator>
   {
     public:
-      typedef std::tr1::unordered_set<sat::Solvable>   ResultSet;
+      typedef std::unordered_set<sat::Solvable>        ResultSet;
       typedef ResultSet::size_type                      size_type;
       typedef ResultSet::const_iterator                 const_iterator;
 
@@ -97,8 +97,8 @@ namespace zypp
       { operator+=( query_r ); }
 
       /** Ctor adding a range of items for which \ref operator+= is defined. */
-      template<class _QueryResultIter>
-      PoolQueryResult( _QueryResultIter begin_r, _QueryResultIter end_r )
+      template<class TQueryResultIter>
+      PoolQueryResult( TQueryResultIter begin_r, TQueryResultIter end_r )
       {
         for_( it, begin_r, end_r )
         {