tags 778191 + patch
thanks
I found this patch by Petr Pisar posted on the yap-users email list:
http://permalink.gmane.org/gmane.comp.ai.prolog.yap.general/1790
I applied his patch, tested it with gcc-5 and found that it fixed the
build error.
I will copy the patch here and please give all credit to Petr. This
patch has not yet been accepted in to the upstream development branch
for yap.
Tested-by: Betty Dall <betty.d...@hp.com>
---
packages/swi-minisat2/C/Solver.C | 4 ++--
packages/swi-minisat2/C/SolverTypes.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/packages/swi-minisat2/C/Solver.C
b/packages/swi-minisat2/C/Solver.C
index 2de3e6d..1bcdbff 100644
--- a/packages/swi-minisat2/C/Solver.C
+++ b/packages/swi-minisat2/C/Solver.C
<at> <at> -120,7 +120,7 <at> <at> bool Solver::addClause(vec<Lit>& ps)
uncheckedEnqueue(ps[0]);
return ok = (propagate() == NULL);
}else{
- Clause* c = Clause_new(ps, false);
+ Clause* c = Clause::Clause_new(ps, false);
clauses.push(c);
attachClause(*c);
}
<at> <at> -599,7 +599,7 <at> <at> lbool Solver::search(int
nof_conflicts, int nof_learnts)
if (learnt_clause.size() == 1){
uncheckedEnqueue(learnt_clause[0]);
}else{
- Clause* c = Clause_new(learnt_clause, true);
+ Clause* c = Clause::Clause_new(learnt_clause, true);
learnts.push(c);
attachClause(*c);
claBumpActivity(*c);
diff --git a/packages/swi-minisat2/C/SolverTypes.h
b/packages/swi-minisat2/C/SolverTypes.h
index 47e3023..919b60b 100644
--- a/packages/swi-minisat2/C/SolverTypes.h
+++ b/packages/swi-minisat2/C/SolverTypes.h
<at> <at> -119,7 +119,7 <at> <at> public:
// -- use this function instead:
template<class V>
- friend Clause* Clause_new(const V& ps, bool learnt = false) {
+ static Clause* Clause_new(const V& ps, bool learnt = false) {
assert(sizeof(Lit) == sizeof(uint32_t));
assert(sizeof(float) == sizeof(uint32_t));
void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size()));
--
Betty Dall
Linux for HP Helion, Hewlett-Packard
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
