Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / solver / detail / SolverQueueItemLock.cc

diff --git a/zypp/solver/detail/SolverQueueItemLock.cc b/zypp/solver/detail/SolverQueueItemLock.cc
index e4386b6..e1c9473 100644 (file)
--- a/zypp/solver/detail/SolverQueueItemLock.cc
+++ b/zypp/solver/detail/SolverQueueItemLock.cc
@@ -22,8 +22,6 @@ extern "C"
 #include <solv/solver.h>
 }
 
-#define ZYPP_USE_RESOLVER_INTERNALS
-
 #include "zypp/base/Logger.h"
 #include "zypp/solver/detail/SolverQueueItemLock.h"
 
@@ -69,7 +67,7 @@ SolverQueueItemLock::~SolverQueueItemLock()
 
 //---------------------------------------------------------------------------
 
-bool SolverQueueItemLock::addRule (sat::detail::CQueue & q)
+bool SolverQueueItemLock::addRule (_Queue & q)
 {
     ::Id id = _item.satSolvable().id();
     if (id == ID_NULL) {
@@ -111,7 +109,7 @@ SolverQueueItemLock::cmp (SolverQueueItem_constPtr item) const
     if (cmp != 0)
         return cmp;
     SolverQueueItemLock_constPtr lock = dynamic_pointer_cast<const SolverQueueItemLock>(item);
-    return compareByNVRA (_item, lock->_item);
+    return compareByNVRA (_item.resolvable(), lock->_item.resolvable());
 }