From d60d619bc54601a9c4d77bec0b348643618a596f Mon Sep 17 00:00:00 2001 From: Klaus Kaempf Date: Thu, 9 Feb 2006 11:45:50 +0000 Subject: [PATCH] undo() dont return void calls --- zypp/Resolver.cc | 10 ++++++---- zypp/Resolver.h | 7 ++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index 8b19370..c335453 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -59,17 +59,19 @@ namespace zypp bool Resolver::verifySystem () { return _pimpl->verifySystem(); } void Resolver::establishPool () - { return _pimpl->establishPool(); } + { _pimpl->establishPool(); } bool Resolver::resolvePool () { return _pimpl->resolvePool (); } + void Resolver::undo() + { _pimpl->undo(); } solver::detail::ResolverContext_Ptr Resolver::context (void) const { return _pimpl->context(); } ResolverProblemList Resolver::problems () { return _pimpl->problems (); } - bool Resolver::applySolutions( const ProblemSolutionList & solutions ) - { return _pimpl->applySolutions (solutions); } + void Resolver::applySolutions( const ProblemSolutionList & solutions ) + { _pimpl->applySolutions (solutions); } void Resolver::doUpgrade( UpgradeStatistics & opt_stats_r ) - { return _pimpl->doUpgrade(opt_stats_r); } + { _pimpl->doUpgrade(opt_stats_r); } Arch Resolver::architecture() const { return _pimpl->architecture(); } void Resolver::setArchitecture( const Arch & arch ) diff --git a/zypp/Resolver.h b/zypp/Resolver.h index d86d44b..9f81ffb 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -76,6 +76,11 @@ namespace zypp bool resolvePool (void); /* + * Undo solver changes done in resolvePool() + */ + void undo( void ); + + /* * Get the most recent resolver context * * It will be NULL if resolvePool() or establishPool() was never called. @@ -110,7 +115,7 @@ namespace zypp * Apply problem solutions. No more than one solution per problem * can be applied. **/ - bool applySolutions( const ProblemSolutionList & solutions ); + void applySolutions( const ProblemSolutionList & solutions ); Arch architecture() const; void setArchitecture( const Arch & arch); -- 2.7.4