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 506e20f..e1c9473 100644 (file)
--- a/zypp/solver/detail/SolverQueueItemLock.cc
+++ b/zypp/solver/detail/SolverQueueItemLock.cc
@@ -17,12 +17,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  * 02111-1307, USA.
  */
+extern "C"
+{
+#include <solv/solver.h>
+}
 
 #include "zypp/base/Logger.h"
 #include "zypp/solver/detail/SolverQueueItemLock.h"
 
 /////////////////////////////////////////////////////////////////////////
-namespace zypp 
+namespace zypp
 { ///////////////////////////////////////////////////////////////////////
   ///////////////////////////////////////////////////////////////////////
   namespace solver
@@ -63,28 +67,28 @@ SolverQueueItemLock::~SolverQueueItemLock()
 
 //---------------------------------------------------------------------------
 
-bool SolverQueueItemLock::addRule (Queue & q, Pool *SATPool)
+bool SolverQueueItemLock::addRule (_Queue & q)
 {
-    Id id = _item.satSolvable().id();
+    ::Id id = _item.satSolvable().id();
     if (id == ID_NULL) {
        ERR << "Lock : " << _item << " not found" << endl;
        return false;
     }
     MIL << "Lock " << _item << " with the SAT-Pool ID: " << id << endl;
-    if (_item.status().isInstalled()) {    
-       if (_soft) {    
-           queue_push( &(q), SOLVER_INSTALL_SOLVABLE | SOLVER_WEAK );
+    if (_item.status().isInstalled()) {
+       if (_soft) {
+           queue_push( &(q), SOLVER_INSTALL | SOLVER_SOLVABLE | SOLVER_WEAK );
        } else {
-           queue_push( &(q), SOLVER_INSTALL_SOLVABLE );        
+           queue_push( &(q), SOLVER_INSTALL | SOLVER_SOLVABLE );
        }
     } else {
-       if (_soft) {    
-           queue_push( &(q), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK );
+       if (_soft) {
+           queue_push( &(q), SOLVER_ERASE | SOLVER_SOLVABLE | SOLVER_WEAK );
        } else {
-           queue_push( &(q), SOLVER_ERASE_SOLVABLE );  
-       }       
+           queue_push( &(q), SOLVER_ERASE | SOLVER_SOLVABLE );
+       }
     }
-    queue_push( &(q), id );    
+    queue_push( &(q), id );
     return true;
 }