3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 06:03:23 +00:00

fix a few more warnings

This commit is contained in:
Nuno Lopes 2021-02-19 12:16:05 +00:00
parent d6ce9cce95
commit e773e1e78d
4 changed files with 6 additions and 9 deletions

View file

@ -21,7 +21,6 @@ Revision History:
#include "model/value_factory.h" #include "model/value_factory.h"
class char_factory final : public value_factory { class char_factory final : public value_factory {
model_core& m_model;
seq_util u; seq_util u;
uint_set m_chars; uint_set m_chars;
unsigned m_next { 'A' }; unsigned m_next { 'A' };
@ -29,9 +28,8 @@ class char_factory final : public value_factory {
public: public:
char_factory(ast_manager & m, family_id fid, model_core& md): char_factory(ast_manager & m, family_id fid):
value_factory(m, fid), value_factory(m, fid),
m_model(md),
u(m), u(m),
m_trail(m) m_trail(m)
{ {

View file

@ -24,7 +24,6 @@ Notes:
#include <queue> #include <queue>
#include <fstream> #include <fstream>
#include <functional>
#include <algorithm> #include <algorithm>
#include "util/scoped_ptr_vector.h" #include "util/scoped_ptr_vector.h"
@ -188,7 +187,7 @@ public:
} }
}; };
struct lemma_lt_proc : public std::function<bool(lemma*, lemma *)> { struct lemma_lt_proc {
bool operator() (lemma *a, lemma *b) { bool operator() (lemma *a, lemma *b) {
return (a->level () < b->level ()) || return (a->level () < b->level ()) ||
(a->level () == b->level () && (a->level () == b->level () &&
@ -731,11 +730,11 @@ inline std::ostream &operator<<(std::ostream &out, pob const &p) {
return p.display(out); return p.display(out);
} }
struct pob_lt_proc : public std::function<bool(const pob*, const pob*)> { struct pob_lt_proc {
bool operator() (const pob *pn1, const pob *pn2) const; bool operator() (const pob *pn1, const pob *pn2) const;
}; };
struct pob_gt_proc : public std::function<bool(const pob*, const pob*)> { struct pob_gt_proc {
bool operator() (const pob *n1, const pob *n2) const { bool operator() (const pob *n1, const pob *n2) const {
return pob_lt_proc()(n2, n1); return pob_lt_proc()(n2, n1);
} }

View file

@ -36,7 +36,7 @@ Revision History:
using namespace spacer; using namespace spacer;
namespace { namespace {
struct index_lt_proc : public std::function<bool(app*, app *)> { struct index_lt_proc {
arith_util m_arith; arith_util m_arith;
index_lt_proc(ast_manager &m) : m_arith(m) {} index_lt_proc(ast_manager &m) : m_arith(m) {}
bool operator() (app *a, app *b) { bool operator() (app *a, app *b) {

View file

@ -376,7 +376,7 @@ namespace smt {
// a stand-alone theory. // a stand-alone theory.
void theory_char::init_model(model_generator & mg) { void theory_char::init_model(model_generator & mg) {
m_factory = alloc(char_factory, get_manager(), get_family_id(), mg.get_model()); m_factory = alloc(char_factory, get_manager(), get_family_id());
mg.register_factory(m_factory); mg.register_factory(m_factory);
for (auto val : m_var2value) for (auto val : m_var2value)
if (val != UINT_MAX) if (val != UINT_MAX)