[gringo] 01/02: fix FTBFS when WITH_THREAD=0

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository gringo.

commit de58e710c82abee9be180ff027f0206ab4b6f6f7
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Mon May 2 07:13:15 2016 +0200

    fix FTBFS when WITH_THREAD=0
    
    remove (void)ass; and quilt refresh gringo-solve-multi.patch.
---
 debian/patches/gringo-solve-multi.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/patches/gringo-solve-multi.patch b/debian/patches/gringo-solve-multi.patch
index 248c871..1484a1f 100644
--- a/debian/patches/gringo-solve-multi.patch
+++ b/debian/patches/gringo-solve-multi.patch
@@ -204,7 +204,7 @@ Index: gringo-git-gbp/libclingo/src/clingocontrol.cc
      }
  }
  bool ClingoControl::onModel(Clasp::Model const &m) {
-@@ -284,11 +285,18 @@ unsigned ClingoControl::getRootKey() {
+@@ -284,29 +285,33 @@ unsigned ClingoControl::getRootKey() {
  Gringo::ConfigProxy &ClingoControl::getConf() {
      return *this;
  }
@@ -225,7 +225,7 @@ Index: gringo-git-gbp/libclingo/src/clingocontrol.cc
      solveIter_ = Gringo::gringo_make_unique<ClingoSolveIter>(clasp->startSolveAsync(), static_cast<Clasp::Asp::LogicProgram&>(*clasp->program()), *out, clasp->ctx);
      return solveIter_.get();
  #else
-@@ -296,11 +304,10 @@ Gringo::SolveIter *ClingoControl::solveI
+-    (void)ass;
      throw std::runtime_error("solveIter requires clingo to be build with thread support");
  #endif
  }
@@ -238,7 +238,13 @@ Index: gringo-git-gbp/libclingo/src/clingocontrol.cc
      solveFuture_ = Gringo::gringo_make_unique<ClingoSolveFuture>(clasp->solveAsync(nullptr));
      return solveFuture_.get();
  #else
-@@ -314,11 +321,6 @@ bool ClingoControl::blocked() {
+     (void)mh;
+     (void)fh;
+-    (void)ass;
+     throw std::runtime_error("solveAsync requires clingo to be build with thread support");
+ #endif
+ }
+@@ -314,11 +319,6 @@ bool ClingoControl::blocked() {
      return clasp->solving();
  }
  void ClingoControl::prepare_(Gringo::Control::ModelHandler mh, Gringo::Control::FinishHandler fh) {
@@ -250,7 +256,7 @@ Index: gringo-git-gbp/libclingo/src/clingocontrol.cc
      if (clingoMode_) {
  #if WITH_THREADS
          solveIter_    = nullptr;
-@@ -331,35 +333,45 @@ void ClingoControl::prepare_(Gringo::Con
+@@ -331,35 +331,45 @@ void ClingoControl::prepare_(Gringo::Con
          if (pgf_) { pgf_(*prg); }
          clasp->prepare(enableEnumAssupmption_ ? Clasp::ClaspFacade::enum_volatile : Clasp::ClaspFacade::enum_static);
          if (psf_) {  psf_(*clasp);}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gringo.git