Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: zypp-commit (606 mails)

< Previous Next >
[zypp-commit] r9706 - /trunk/libzypp/zypp/solver/detail/
  • From: schubi2@xxxxxxxxxxxxxxxx
  • Date: Fri, 18 Apr 2008 15:46:13 -0000
  • Message-id: <20080418154613.667F72ECA4@xxxxxxxxxxxxxxxx>
Author: schubi2
Date: Fri Apr 18 17:46:12 2008
New Revision: 9706

URL: http://svn.opensuse.org/viewcvs/zypp?rev=9706&view=rev
Log:
cleanup in order to avoid namespace-conflicts with the SAT-solver

Modified:
trunk/libzypp/zypp/solver/detail/SATResolver.cc
trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc
trunk/libzypp/zypp/solver/detail/SolverQueueItem.h
trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc
trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h
trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc
trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h
trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc
trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h
trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.cc
trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.h
trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc
trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h

Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATResolver.cc?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Fri Apr 18 17:46:12 2008
@@ -708,7 +708,7 @@

// generate solver queue
for (SolverQueueItemList::const_iterator iter = requestQueue.begin(); iter
!= requestQueue.end(); iter++) {
- (*iter)->addRule(_jobQueue,_SATPool);
+ (*iter)->addRule(_jobQueue);
}

// solving

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc Fri Apr 18 17:46:12 2008
@@ -21,6 +21,10 @@
#include "zypp/base/Logger.h"
#include "zypp/solver/detail/SolverQueueItem.h"

+extern "C" {
+ #include "satsolver/solver.h"
+ #include "satsolver/pool.h"
+}

/////////////////////////////////////////////////////////////////////////
namespace zypp

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItem.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItem.h?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItem.h (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItem.h Fri Apr 18 17:46:12 2008
@@ -32,9 +32,7 @@
#include "zypp/ResPool.h"

extern "C" {
- struct Queue;
-//#include "satsolver/solver.h"
-//#include "satsolver/pool.h"
+ struct _Queue;
}


@@ -105,7 +103,7 @@


virtual SolverQueueItem_Ptr copy (void) const = 0;
- virtual bool addRule (Queue & q, Pool *SATPool) =0 ;
+ virtual bool addRule (_Queue & q) =0 ;
virtual int cmp (SolverQueueItem_constPtr item) const = 0;
int compare (SolverQueueItem_constPtr item) const { return CMP(_type,
item->_type); }


Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc Fri Apr 18
17:46:12 2008
@@ -19,8 +19,14 @@
*/

#include "zypp/base/Logger.h"
+#include "zypp/IdString.h"
#include "zypp/solver/detail/SolverQueueItemDelete.h"

+extern "C" {
+ #include "satsolver/solver.h"
+ #include "satsolver/pool.h"
+}
+
/////////////////////////////////////////////////////////////////////////
namespace zypp
{ ///////////////////////////////////////////////////////////////////////
@@ -62,9 +68,9 @@

//---------------------------------------------------------------------------

-bool SolverQueueItemDelete::addRule (Queue & q, Pool *SATPool)
+bool SolverQueueItemDelete::addRule (_Queue & q)
{
- Id id = str2id( SATPool, _name.c_str(), 0 );
+ ::Id id = IdString(_name).id();
if (_soft) {
queue_push( &(q), SOLVER_ERASE_SOLVABLE_NAME | SOLVER_WEAK);
} else {

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h Fri Apr 18
17:46:12 2008
@@ -67,7 +67,7 @@

// ---------------------------------- methods

- virtual bool addRule (Queue & q, Pool *SATPool);
+ virtual bool addRule (_Queue & q);
virtual SolverQueueItem_Ptr copy (void) const;
virtual int cmp (SolverQueueItem_constPtr item) const;
};

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc Fri Apr 18
17:46:12 2008
@@ -19,8 +19,15 @@
*/

#include "zypp/base/Logger.h"
+#include "zypp/IdString.h"
+#include "zypp/IdStringType.h"
#include "zypp/solver/detail/SolverQueueItemInstall.h"

+extern "C" {
+ #include "satsolver/solver.h"
+ #include "satsolver/pool.h"
+}
+
/////////////////////////////////////////////////////////////////////////
namespace zypp
{ ///////////////////////////////////////////////////////////////////////
@@ -63,9 +70,9 @@

//---------------------------------------------------------------------------

-bool SolverQueueItemInstall::addRule (Queue & q, Pool *SATPool)
+bool SolverQueueItemInstall::addRule (_Queue & q)
{
- Id id = str2id( SATPool, _name.c_str(), 0 );
+ ::Id id = IdString(_name).id();
if (_soft) {
queue_push( &(q), SOLVER_INSTALL_SOLVABLE_NAME | SOLVER_WEAK );
} else {

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h Fri Apr 18
17:46:12 2008
@@ -66,7 +66,7 @@

// ---------------------------------- methods

- virtual bool addRule (Queue & q, Pool *SATPool);
+ virtual bool addRule (_Queue & q);
virtual SolverQueueItem_Ptr copy (void) const;
virtual int cmp (SolverQueueItem_constPtr item) const;
};

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc Fri Apr 18
17:46:12 2008
@@ -21,6 +21,11 @@
#include "zypp/base/Logger.h"
#include "zypp/solver/detail/SolverQueueItemInstallOneOf.h"

+extern "C" {
+ #include "satsolver/solver.h"
+ #include "satsolver/pool.h"
+}
+
/////////////////////////////////////////////////////////////////////////
namespace zypp
{ ///////////////////////////////////////////////////////////////////////
@@ -65,7 +70,7 @@

//---------------------------------------------------------------------------

-bool SolverQueueItemInstallOneOf::addRule (Queue & q, Pool *SATPool)
+bool SolverQueueItemInstallOneOf::addRule (_Queue & q)
{
bool ret = true;
MIL << "Install one of: " << endl;

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h Fri Apr 18
17:46:12 2008
@@ -63,7 +63,7 @@

// ---------------------------------- methods

- virtual bool addRule (Queue & q, Pool *SATPool);
+ virtual bool addRule (_Queue & q);
virtual SolverQueueItem_Ptr copy (void) const;
virtual int cmp (SolverQueueItem_constPtr item) const;
};

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.cc?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.cc Fri Apr 18 17:46:12
2008
@@ -21,6 +21,11 @@
#include "zypp/base/Logger.h"
#include "zypp/solver/detail/SolverQueueItemLock.h"

+extern "C" {
+ #include "satsolver/solver.h"
+ #include "satsolver/pool.h"
+}
+
/////////////////////////////////////////////////////////////////////////
namespace zypp
{ ///////////////////////////////////////////////////////////////////////
@@ -63,9 +68,9 @@

//---------------------------------------------------------------------------

-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;

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.h?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.h (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemLock.h Fri Apr 18 17:46:12
2008
@@ -66,7 +66,7 @@

// ---------------------------------- methods

- virtual bool addRule (Queue & q, Pool *SATPool);
+ virtual bool addRule (_Queue & q);
virtual SolverQueueItem_Ptr copy (void) const;
virtual int cmp (SolverQueueItem_constPtr item) const;
};

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc Fri Apr 18
17:46:12 2008
@@ -21,6 +21,11 @@
#include "zypp/base/Logger.h"
#include "zypp/solver/detail/SolverQueueItemUpdate.h"

+extern "C" {
+ #include "satsolver/solver.h"
+ #include "satsolver/pool.h"
+}
+
/////////////////////////////////////////////////////////////////////////
namespace zypp
{ ///////////////////////////////////////////////////////////////////////
@@ -63,9 +68,9 @@

//---------------------------------------------------------------------------

-bool SolverQueueItemUpdate::addRule (Queue & q, Pool *SATPool)
+bool SolverQueueItemUpdate::addRule (_Queue & q)
{
- Id id = _item.satSolvable().id();
+ ::Id id = _item.satSolvable().id();
if (id == ID_NULL) {
ERR << "Update explicit: " << _item << " not found" << endl;
return false;

Modified: trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h?rev=9706&r1=9705&r2=9706&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h (original)
+++ trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h Fri Apr 18
17:46:12 2008
@@ -66,7 +66,7 @@

// ---------------------------------- methods

- virtual bool addRule (Queue & q, Pool *SATPool);
+ virtual bool addRule (_Queue & q);
virtual SolverQueueItem_Ptr copy (void) const;
virtual int cmp (SolverQueueItem_constPtr item) const;
};

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages