* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307, USA.
*/
+extern "C"
+{
+#include <solv/solver.h>
+}
+
+#define ZYPP_USE_RESOLVER_INTERNALS
#include "zypp/base/Logger.h"
#include "zypp/solver/detail/SolverQueueItemUpdate.h"
-#include "satsolver/solver.h"
/////////////////////////////////////////////////////////////////////////
-namespace zypp
+namespace zypp
{ ///////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////
namespace solver
//---------------------------------------------------------------------------
-bool SolverQueueItemUpdate::addRule (_Queue & q)
+bool SolverQueueItemUpdate::addRule (sat::detail::CQueue & q)
{
::Id id = _item.satSolvable().id();
if (id == ID_NULL) {
return false;
}
MIL << "Update explicit " << _item << " with the SAT-Pool ID: " << id << endl;
- queue_push( &(q), SOLVER_INSTALL_SOLVABLE_UPDATE );
- queue_push( &(q), id );
+ queue_push( &(q), SOLVER_UPDATE | SOLVER_SOLVABLE );
+ queue_push( &(q), id );
return true;
}
if (cmp != 0)
return cmp;
SolverQueueItemUpdate_constPtr update = dynamic_pointer_cast<const SolverQueueItemUpdate>(item);
- return compareByNVRA (_item.resolvable(), update->_item.resolvable());
+ return compareByNVRA (_item, update->_item);
}