From fe10f2d244989b549b0e8e4c8f5291a4e82173e4 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Sat, 10 Dec 2016 07:51:16 +0100 Subject: [PATCH] address #835 Signed-off-by: Nikolaj Bjorner --- src/muz/rel/dl_relation_manager.cpp | 4 ++++ src/qe/qe_arrays.cpp | 2 +- src/qe/qe_datatypes.cpp | 2 +- src/smt/smt_model_finder.cpp | 2 +- src/tactic/fpa/fpa2bv_tactic.cpp | 10 +++++----- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/muz/rel/dl_relation_manager.cpp b/src/muz/rel/dl_relation_manager.cpp index 7a73afd03..f8125f7a6 100644 --- a/src/muz/rel/dl_relation_manager.cpp +++ b/src/muz/rel/dl_relation_manager.cpp @@ -1622,6 +1622,8 @@ namespace datalog { m_union_fn = plugin.mk_union_fn(t, *m_aux_table, static_cast(0)); } + virtual ~default_table_map() {} + virtual void operator()(table_base & t) { SASSERT(t.get_signature()==m_aux_table->get_signature()); if(!m_aux_table->empty()) { @@ -1678,6 +1680,8 @@ namespace datalog { m_former_row.resize(get_result_signature().size()); } + virtual ~default_table_project_with_reduce_fn() {} + virtual void modify_fact(table_fact & f) const { unsigned ofs=1; unsigned r_i=1; diff --git a/src/qe/qe_arrays.cpp b/src/qe/qe_arrays.cpp index f8f44b6d9..a010c4ae4 100644 --- a/src/qe/qe_arrays.cpp +++ b/src/qe/qe_arrays.cpp @@ -110,7 +110,7 @@ namespace qe { imp(ast_manager& m): m(m), a(m) {} ~imp() {} - virtual bool solve(model& model, app_ref_vector& vars, expr_ref_vector& lits) { + bool solve(model& model, app_ref_vector& vars, expr_ref_vector& lits) { return false; } diff --git a/src/qe/qe_datatypes.cpp b/src/qe/qe_datatypes.cpp index aa67d28a3..8536e337f 100644 --- a/src/qe/qe_datatypes.cpp +++ b/src/qe/qe_datatypes.cpp @@ -37,7 +37,7 @@ namespace qe { imp(ast_manager& m): m(m), dt(m), m_val(m) {} - virtual bool solve(model& model, app_ref_vector& vars, expr_ref_vector& lits) { + bool solve(model& model, app_ref_vector& vars, expr_ref_vector& lits) { return lift_foreign(vars, lits); } diff --git a/src/smt/smt_model_finder.cpp b/src/smt/smt_model_finder.cpp index b8320f329..ff84992e1 100644 --- a/src/smt/smt_model_finder.cpp +++ b/src/smt/smt_model_finder.cpp @@ -498,7 +498,7 @@ namespace smt { m_bvsimp = static_cast(s.get_plugin(m.mk_family_id("bv"))); } - ~auf_solver() { + virtual ~auf_solver() { flush_nodes(); reset_eval_cache(); } diff --git a/src/tactic/fpa/fpa2bv_tactic.cpp b/src/tactic/fpa/fpa2bv_tactic.cpp index 28597c6ec..d55a2e25c 100644 --- a/src/tactic/fpa/fpa2bv_tactic.cpp +++ b/src/tactic/fpa/fpa2bv_tactic.cpp @@ -46,11 +46,11 @@ class fpa2bv_tactic : public tactic { m_rw.cfg().updt_params(p); } - virtual void operator()(goal_ref const & g, - goal_ref_buffer & result, - model_converter_ref & mc, - proof_converter_ref & pc, - expr_dependency_ref & core) { + void operator()(goal_ref const & g, + goal_ref_buffer & result, + model_converter_ref & mc, + proof_converter_ref & pc, + expr_dependency_ref & core) { SASSERT(g->is_well_sorted()); m_proofs_enabled = g->proofs_enabled(); m_produce_models = g->models_enabled();