Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / sat / Transaction.cc

diff --git a/zypp/sat/Transaction.cc b/zypp/sat/Transaction.cc
index 2f01f90..560c7b1 100644 (file)
--- a/zypp/sat/Transaction.cc
+++ b/zypp/sat/Transaction.cc
@@ -18,7 +18,7 @@ extern "C"
 #include "zypp/base/SerialNumber.h"
 #include "zypp/base/DefaultIntegral.h"
 #include "zypp/base/NonCopyable.h"
-#include "zypp/base/Hash.h"
+#include "zypp/base/Tr1hash.h"
 
 #include "zypp/sat/detail/PoolImpl.h"
 #include "zypp/sat/Transaction.h"
@@ -50,8 +50,8 @@ namespace zypp
       friend std::ostream & operator<<( std::ostream & str, const Impl & obj );
 
       public:
-       typedef std::unordered_set<detail::IdType> set_type;
-       typedef std::unordered_map<detail::IdType,detail::IdType> map_type;
+       typedef std::tr1::unordered_set<detail::IdType> set_type;
+       typedef std::tr1::unordered_map<detail::IdType,detail::IdType> map_type;
 
        struct PostMortem
        {
@@ -67,7 +67,7 @@ namespace zypp
          Edition  _edition;
          Arch     _arch;
        };
-       typedef std::unordered_map<detail::IdType,PostMortem> pmmap_type;
+       typedef std::tr1::unordered_map<detail::IdType,PostMortem> pmmap_type;
 
       public:
        Impl()
@@ -79,17 +79,18 @@ namespace zypp
          , _trans( nullptr )
        {
          Queue decisionq;
-         for ( const PoolItem & pi : ResPool::instance() )
+         for_( it, ResPool::instance().begin(), ResPool::instance().end() )
          {
-           if ( ! pi.status().transacts() )
+           if ( ! (*it).status().transacts() )
              continue;
-           decisionq.push( pi.isSystem() ? -pi.id() : pi.id() );
+           sat::Solvable solv( (*it).satSolvable() );
+           decisionq.push( solv.isSystem() ? -solv.id() : solv.id() );
          }
          Queue noobsq;
-         for ( const Solvable & solv : myPool().multiversionList() )
+         for_( it, sat::Pool::instance().multiversionBegin(), sat::Pool::instance().multiversionEnd() )
          {
-           noobsq.push( SOLVER_NOOBSOLETES | SOLVER_SOLVABLE );
-           noobsq.push( solv.id() );
+           noobsq.push( SOLVER_NOOBSOLETES | SOLVER_SOLVABLE_NAME );
+           noobsq.push( it->id() );
          }
          Map noobsmap;
          ::solver_calculate_noobsmap( myPool().getPool(), noobsq, noobsmap );