From 9869bd5d2ea342c43e9c3d557fdc44fed8ea6aa4 Mon Sep 17 00:00:00 2001
From: Michael Andres <ma@suse.de>
Date: Tue, 12 Feb 2019 14:32:10 +0100
Subject: [PATCH] Adapt to boost-1.69 requiring explicit casts tribool->bool
(fixes #255)
---
src/commands/optionsets.cc | 2 +-
.../search/search-packages-hinthack.cc | 2 +-
src/commands/services/modify.cc | 4 ++--
src/output/Out.h | 2 +-
src/repos.cc | 14 ++++++------
src/solve-commit.cc | 22 +++++++++----------
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/commands/optionsets.cc b/src/commands/optionsets.cc
index db45dd9d..fd114261 100644
--- a/src/commands/optionsets.cc
+++ b/src/commands/optionsets.cc
@@ -329,7 +329,7 @@ bool InteractiveUpdatesOptionSet::skipInteractive() const
{
bool skip_interactive = false;
if ( !indeterminate( _withInteractive ) )
- skip_interactive = ! _withInteractive;
+ skip_interactive = ! bool(_withInteractive);
// bnc #497711
else if ( Zypper::instance().config().non_interactive )
skip_interactive = true;
diff --git a/src/commands/search/search-packages-hinthack.cc b/src/commands/search/search-packages-hinthack.cc
index 33444825..48fba7c1 100644
--- a/src/commands/search/search-packages-hinthack.cc
+++ b/src/commands/search/search-packages-hinthack.cc
@@ -115,7 +115,7 @@ namespace searchPackagesHintHack
}
zypper_r.out().gap();
- return( callSP == true );
+ return bool(callSP);
}
/** Forward the search request to search-packages subcommand. */
diff --git a/src/commands/services/modify.cc b/src/commands/services/modify.cc
index 405d5312..cafc523d 100644
--- a/src/commands/services/modify.cc
+++ b/src/commands/services/modify.cc
@@ -146,14 +146,14 @@ int ModifyServiceCmd::modifyService( Zypper & zypper, const std::string & alias
{
if ( enable != srv.enabled() )
changed_enabled = true;
- srv.setEnabled( enable );
+ srv.setEnabled( bool(enable) );
}
if ( !indeterminate(autoref) )
{
if ( autoref != srv.autorefresh() )
changed_autoref = true;
- srv.setAutorefresh( autoref );
+ srv.setAutorefresh( bool(autoref) );
}
const std::string &name = _commonProperties._name;
diff --git a/src/output/Out.h b/src/output/Out.h
index 55896700..6b5ef062 100644
--- a/src/output/Out.h
+++ b/src/output/Out.h
@@ -1005,7 +1005,7 @@ public:
_progress.noSend(); // suppress ~ProgressData final report
if ( indeterminate( _error ) )
_error = ( _progress.reportValue() != 100 && _progress.reportPercent() );
- _out.progressEnd( _progressId, outLabel( _progress.name() ), _error );
+ _out.progressEnd( _progressId, outLabel( _progress.name() ), bool(_error) );
}
/** Immediately print the progress bar not waiting for a new trigger. */
diff --git a/src/repos.cc b/src/repos.cc
index b93c3144..f91d0d42 100644
--- a/src/repos.cc
+++ b/src/repos.cc
@@ -1330,7 +1330,7 @@ void add_repo_by_url( Zypper & zypper,
repo.setPriority( repoProps._priority );
if ( !indeterminate( repoProps._keepPackages ) )
- repo.setKeepPackages( repoProps._keepPackages );
+ repo.setKeepPackages( bool(repoProps._keepPackages) );
RepoInfo::GpgCheck gpgCheck = repoProps._gpgCheck;
if ( gpgCheck != RepoInfo::GpgCheck::indeterminate )
@@ -1409,13 +1409,13 @@ void add_repo_from_file( Zypper & zypper,
repo.setName( opts._name );
if ( !indeterminate(opts._enable) )
- repo.setEnabled( opts._enable );
+ repo.setEnabled( bool(opts._enable) );
if ( !indeterminate( opts._enableAutoRefresh) )
- repo.setAutorefresh( opts._enableAutoRefresh );
+ repo.setAutorefresh( bool(opts._enableAutoRefresh) );
if ( !indeterminate( repoProps._keepPackages ) )
- repo.setKeepPackages( repoProps._keepPackages );
+ repo.setKeepPackages( bool(repoProps._keepPackages) );
if ( gpgCheck != RepoInfo::GpgCheck::indeterminate )
repo.setGpgCheck( gpgCheck );
@@ -1571,21 +1571,21 @@ void modify_repo( Zypper & zypper, const std::string & alias, const RepoServiceC
{
if ( enable != repo.enabled() )
changed_enabled = true;
- repo.setEnabled( enable );
+ repo.setEnabled( bool(enable) );
}
if ( !indeterminate(autoref) )
{
if ( autoref != repo.autorefresh())
changed_autoref = true;
- repo.setAutorefresh( autoref );
+ repo.setAutorefresh( bool(autoref) );
}
if ( !indeterminate(keepPackages) )
{
if ( keepPackages != repo.keepPackages() )
changed_keeppackages = true;
- repo.setKeepPackages( keepPackages );
+ repo.setKeepPackages( bool(keepPackages) );
}
if ( gpgCheck != RepoInfo::GpgCheck::indeterminate )
diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index d725a1cb..6e7d1371 100755
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -171,7 +171,7 @@ static bool show_problems( Zypper & zypper )
TriBool stopnow = show_problem( zypper, *probPtr, todo );
if ( !indeterminate( stopnow ) )
{
- retry = stopnow;
+ retry = bool(stopnow);
break;
}
}
@@ -239,10 +239,10 @@ static void set_force_resolution( Zypper & zypper )
DBG << "force resolution: " << force_resolution << endl;
std::ostringstream s;
- s << _("Force resolution:") << " " << asYesNo( force_resolution );
+ s << _("Force resolution:") << " " << asYesNo( bool(force_resolution) );
zypper.out().info(s.str(), Out::HIGH);
- God->resolver()->setForceResolve( force_resolution );
+ God->resolver()->setForceResolve( bool(force_resolution) );
}
static void set_clean_deps( Zypper & zypper )
@@ -305,17 +305,17 @@ static void set_solver_flags( Zypper & zypper )
const auto &solverSettings = SolverSettings::instance();
if ( zypper.command() == ZypperCommand::DIST_UPGRADE )
{
- if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->dupSetAllowDowngrade( solverSettings._allowDowngrade );
- if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->dupSetAllowNameChange( solverSettings._allowNameChange );
- if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->dupSetAllowArchChange( solverSettings._allowArchChange );
- if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->dupSetAllowVendorChange( solverSettings._allowVendorChange );
+ if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->dupSetAllowDowngrade( bool(solverSettings._allowDowngrade) );
+ if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->dupSetAllowNameChange( bool(solverSettings._allowNameChange) );
+ if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->dupSetAllowArchChange( bool(solverSettings._allowArchChange) );
+ if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->dupSetAllowVendorChange( bool(solverSettings._allowVendorChange) );
}
else
{
- if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->setAllowDowngrade( solverSettings._allowDowngrade );
- if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->setAllowNameChange( solverSettings._allowNameChange );
- if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->setAllowArchChange( solverSettings._allowArchChange );
- if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->setAllowVendorChange( solverSettings._allowVendorChange );
+ if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->setAllowDowngrade( bool(solverSettings._allowDowngrade) );
+ if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->setAllowNameChange( bool(solverSettings._allowNameChange) );
+ if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->setAllowArchChange( bool(solverSettings._allowArchChange) );
+ if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->setAllowVendorChange( bool(solverSettings._allowVendorChange) );
}
}
--
2.20.1