Imported Upstream version 14.45.0

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

diff --git a/zypp/solver/detail/SolutionAction.cc b/zypp/solver/detail/SolutionAction.cc
index 4ff9100..77d3b39 100644 (file)
--- a/zypp/solver/detail/SolutionAction.cc
+++ b/zypp/solver/detail/SolutionAction.cc
@@ -21,11 +21,8 @@
  * 02111-1307, USA.
  */
 
-#define ZYPP_USE_RESOLVER_INTERNALS
-
 #include "zypp/solver/detail/Resolver.h"
 #include "zypp/solver/detail/SolutionAction.h"
-#include "zypp/solver/detail/SolverQueueItem.h"
 #include "zypp/Capabilities.h"
 #include "zypp/base/Logger.h"
 
@@ -42,6 +39,8 @@ namespace zypp
 using namespace std;
 
 IMPL_PTR_TYPE(SolutionAction);
+IMPL_PTR_TYPE(TransactionSolutionAction);
+IMPL_PTR_TYPE(InjectSolutionAction);
 
 //---------------------------------------------------------------------------
 
@@ -86,6 +85,17 @@ operator<<( ostream& os, const SolutionActionList & actionlist)
     return os;
 }
 
+
+ostream&
+operator<<( ostream& os, const CSolutionActionList & actionlist)
+{
+    for (CSolutionActionList::const_iterator iter = actionlist.begin(); iter != actionlist.end(); ++iter) {
+       os << *(*iter);
+       os << endl;
+    }
+    return os;
+}
+
 //---------------------------------------------------------------------------
 
 ostream &
@@ -115,7 +125,7 @@ SolutionAction::dumpOn( std::ostream & os ) const
 
 
 bool
-TransactionSolutionAction::execute(ResolverInternal & resolver) const
+TransactionSolutionAction::execute(Resolver & resolver) const
 {
     bool ret = true;
     switch (action()) {
@@ -167,7 +177,7 @@ TransactionSolutionAction::execute(ResolverInternal & resolver) const
 }
 
 bool
-InjectSolutionAction::execute(ResolverInternal & resolver) const
+InjectSolutionAction::execute(Resolver & resolver) const
 {
     switch (_kind) {
         case WEAK: