Fixing some compilation problems with clang++

marekpiotrow · Jun 8, 2022 · 38f7f75 · 38f7f75
1 parent 10f7c57
commit 38f7f75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cominisatps.patch b/cominisatps.patch
@@ -252,8 +252,8 @@ diff -urB cominisatps-SAT2016/core/Solver.h cominisatps/core/Solver.h
  inline void     Solver::toDimacs     (const char* file, Lit p, Lit q, Lit r){ vec<Lit> as; as.push(p); as.push(q); as.push(r); toDimacs(file, as); }
 -
 +// IPASIR
-+void Solver::setTermCallback(void *state, int (*termCallback)(void *)) {
-+    termCallbackState = state; termCallback = termCallback; }
++void Solver::setTermCallback(void *state, int (*termcallback)(void *)) {
++    termCallbackState = state; termCallback = termcallback; }
 
  //=================================================================================================
  // Debug etc:

diff --git a/ipamir.cc b/ipamir.cc
@@ -244,6 +244,8 @@ IPAMIR_API void ipamir_assume (void * solver, int32_t lit)
  * Required state: INPUT or OPTIMAL or SAT or UNSAT
  * State after: INPUT or OPTIMAL or SAT or UNSAT or ERROR
  */
+extern "C++" void clear_shared_formulas();
+
 IPAMIR_API int ipamir_solve (void * solver)
 {
     MySolver* s = (MySolver*)solver;
@@ -264,7 +266,6 @@ IPAMIR_API int ipamir_solve (void * solver)
     s->new_soft_lit.clear();
     s->solver->ipamir_reset(s->assumptions);
 
-    extern void clear_shared_formulas();
     clear_shared_formulas();
 
     s->solver->maxsat_solve(PbSolver::sc_Minimize);