Author: dmacvicar Date: Mon Apr 14 22:45:38 2008 New Revision: 9625 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9625&view=rev Log: - fix compilation - classes in namespace solver/detail but in sat dir? - cmp functions not implemented (and purte virtual) -> comment Added: trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItem.cc trunk/libzypp/zypp/solver/detail/SolverQueueItem.h - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItem.h trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemDelete.cc trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemDelete.h trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstall.cc trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstall.h trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.cc trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.h trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemUpdate.cc trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h - copied, changed from r9624, trunk/libzypp/zypp/sat/SolverQueueItemUpdate.h Removed: trunk/libzypp/zypp/sat/SolverQueueItem.cc trunk/libzypp/zypp/sat/SolverQueueItem.h trunk/libzypp/zypp/sat/SolverQueueItemDelete.cc trunk/libzypp/zypp/sat/SolverQueueItemDelete.h trunk/libzypp/zypp/sat/SolverQueueItemInstall.cc trunk/libzypp/zypp/sat/SolverQueueItemInstall.h trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.cc trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.h trunk/libzypp/zypp/sat/SolverQueueItemUpdate.cc trunk/libzypp/zypp/sat/SolverQueueItemUpdate.h Modified: trunk/libzypp/zypp/CMakeLists.txt Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=9625&r1=9624&r2=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Mon Apr 14 22:45:38 2008 @@ -489,6 +489,12 @@ solver/detail/Resolver_problems.cc solver/detail/SolutionAction.cc solver/detail/Testcase.cc + solver/detail/SolverQueueItem.cc + solver/detail/SolverQueueItemInstall.cc + solver/detail/SolverQueueItemDelete.cc + solver/detail/SolverQueueItemUpdate.cc + solver/detail/SolverQueueItemInstallOneOf.cc + ) SET( zypp_solver_detail_HEADERS @@ -521,11 +527,6 @@ sat/LookupAttr.cc sat/SATResolver.cc sat/SolvAttr.cc - sat/SolverQueueItem.cc - sat/SolverQueueItemInstall.cc - sat/SolverQueueItemDelete.cc - sat/SolverQueueItemUpdate.cc - sat/SolverQueueItemInstallOneOf.cc ) SET( zypp_sat_HEADERS Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc (from r9624, trunk/libzypp/zypp/sat/SolverQueueItem.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc&p1=trunk/libzypp/zypp/sat/SolverQueueItem.cc&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItem.cc (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItem.cc Mon Apr 14 22:45:38 2008 @@ -19,7 +19,7 @@ */ #include "zypp/base/Logger.h" -#include "zypp/sat/SolverQueueItem.h" +#include "zypp/solver/detail/SolverQueueItem.h" ///////////////////////////////////////////////////////////////////////// Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItem.h (from r9624, trunk/libzypp/zypp/sat/SolverQueueItem.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItem.h?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItem.h&p1=trunk/libzypp/zypp/sat/SolverQueueItem.h&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItem.h (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItem.h Mon Apr 14 22:45:38 2008 @@ -96,7 +96,7 @@ virtual SolverQueueItem_Ptr copy (void) const = 0; - virtual int cmp (SolverQueueItem_constPtr item) const = 0; + //virtual int cmp (SolverQueueItem_constPtr item) const = 0; int compare (SolverQueueItem_constPtr item) const { return CMP(_type, item->_type); } Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemDelete.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc&p1=trunk/libzypp/zypp/sat/SolverQueueItemDelete.cc&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemDelete.cc (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.cc Mon Apr 14 22:45:38 2008 @@ -19,7 +19,7 @@ */ #include "zypp/base/Logger.h" -#include "zypp/sat/SolverQueueItemDelete.h" +#include "zypp/solver/detail/SolverQueueItemDelete.h" ///////////////////////////////////////////////////////////////////////// namespace zypp Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemDelete.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h&p1=trunk/libzypp/zypp/sat/SolverQueueItemDelete.h&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemDelete.h (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemDelete.h Mon Apr 14 22:45:38 2008 @@ -1,3 +1,4 @@ + /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* QueueItem.h * @@ -24,7 +25,7 @@ #include <iosfwd> #include <string> -#include "zypp/sat/SolverQueueItem.h" +#include "zypp/solver/detail/SolverQueueItem.h" ///////////////////////////////////////////////////////////////////////// namespace zypp @@ -69,7 +70,7 @@ // ---------------------------------- methods virtual SolverQueueItem_Ptr copy (void) const; - virtual int cmp (SolverQueueItem_constPtr item) const; + //virtual int cmp (SolverQueueItem_constPtr item) const; }; /////////////////////////////////////////////////////////////////// Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstall.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc&p1=trunk/libzypp/zypp/sat/SolverQueueItemInstall.cc&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemInstall.cc (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.cc Mon Apr 14 22:45:38 2008 @@ -19,7 +19,7 @@ */ #include "zypp/base/Logger.h" -#include "zypp/sat/SolverQueueItemInstall.h" +#include "zypp/solver/detail/SolverQueueItemInstall.h" ///////////////////////////////////////////////////////////////////////// namespace zypp Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstall.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h&p1=trunk/libzypp/zypp/sat/SolverQueueItemInstall.h&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemInstall.h (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstall.h Mon Apr 14 22:45:38 2008 @@ -24,7 +24,7 @@ #include <iosfwd> #include <string> -#include "zypp/sat/SolverQueueItem.h" +#include "zypp/solver/detail/SolverQueueItem.h" ///////////////////////////////////////////////////////////////////////// namespace zypp @@ -69,7 +69,7 @@ // ---------------------------------- methods virtual SolverQueueItem_Ptr copy (void) const; - virtual int cmp (SolverQueueItem_constPtr item) const; + //virtual int cmp (SolverQueueItem_constPtr item) const; }; /////////////////////////////////////////////////////////////////// Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc&p1=trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.cc&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.cc (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.cc Mon Apr 14 22:45:38 2008 @@ -19,7 +19,7 @@ */ #include "zypp/base/Logger.h" -#include "zypp/sat/SolverQueueItemInstallOneOf.h" +#include "zypp/solver/detail/SolverQueueItemInstallOneOf.h" ///////////////////////////////////////////////////////////////////////// namespace zypp Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h&p1=trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.h&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemInstallOneOf.h (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemInstallOneOf.h Mon Apr 14 22:45:38 2008 @@ -24,7 +24,7 @@ #include <iosfwd> #include <string> -#include "zypp/sat/SolverQueueItem.h" +#include "zypp/solver/detail/SolverQueueItem.h" ///////////////////////////////////////////////////////////////////////// namespace zypp @@ -72,7 +72,7 @@ // ---------------------------------- methods virtual SolverQueueItem_Ptr copy (void) const; - virtual int cmp (SolverQueueItem_constPtr item) const; + //virtual int cmp (SolverQueueItem_constPtr item) const; }; /////////////////////////////////////////////////////////////////// Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemUpdate.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc&p1=trunk/libzypp/zypp/sat/SolverQueueItemUpdate.cc&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemUpdate.cc (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.cc Mon Apr 14 22:45:38 2008 @@ -19,7 +19,7 @@ */ #include "zypp/base/Logger.h" -#include "zypp/sat/SolverQueueItemUpdate.h" +#include "zypp/solver/detail/SolverQueueItemUpdate.h" ///////////////////////////////////////////////////////////////////////// namespace zypp Copied: trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h (from r9624, trunk/libzypp/zypp/sat/SolverQueueItemUpdate.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h?p2=trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h&p1=trunk/libzypp/zypp/sat/SolverQueueItemUpdate.h&r1=9624&r2=9625&rev=9625&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolverQueueItemUpdate.h (original) +++ trunk/libzypp/zypp/solver/detail/SolverQueueItemUpdate.h Mon Apr 14 22:45:38 2008 @@ -24,7 +24,7 @@ #include <iosfwd> #include <string> -#include "zypp/sat/SolverQueueItem.h" +#include "zypp/solver/detail/SolverQueueItem.h" #include "zypp/PoolItem.h" ///////////////////////////////////////////////////////////////////////// @@ -70,7 +70,7 @@ // ---------------------------------- methods virtual SolverQueueItem_Ptr copy (void) const; - virtual int cmp (SolverQueueItem_constPtr item) const; + //virtual int cmp (SolverQueueItem_constPtr item) const; }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org