3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00

fix compiler warnings and errors

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-04-03 17:03:07 -07:00
parent 155f629d96
commit afd83f41b8
3 changed files with 11 additions and 4 deletions

View file

@ -39,7 +39,7 @@ namespace fdd {
unsigned m_ref_count; unsigned m_ref_count;
void reset(); void reset();
public: public:
node() : m_var(0), m_hi(0), m_lo(0), m_ref_count(0) {} node() : m_var(0), m_lo(0), m_hi(0), m_ref_count(0) {}
node(unsigned var, node_id l, node_id h): m_var(var), m_lo(l), m_hi(h), m_ref_count(0) {} node(unsigned var, node_id l, node_id h): m_var(var), m_lo(l), m_hi(h), m_ref_count(0) {}
unsigned get_hash() const; unsigned get_hash() const;
@ -93,9 +93,13 @@ namespace fdd {
class manager { class manager {
public: public:
typedef int64 Key; typedef int64 Key;
typedef node::hash node_hash;
typedef node::eq node_eq;
typedef config::hash config_hash;
typedef config::eq config_eq;
private: private:
typedef map<node, unsigned, typename node::hash, typename node::eq> node_table; typedef map<node, unsigned, node_hash, node_eq> node_table;
typedef map<config, node_id, typename config::hash, typename config::eq> insert_cache; typedef map<config, node_id, config_hash, config_eq> insert_cache;
node_table m_table; node_table m_table;
insert_cache m_insert_cache; insert_cache m_insert_cache;
svector<node> m_nodes; svector<node> m_nodes;

View file

@ -220,6 +220,7 @@ static void on_ctrl_c(int) {
raise(SIGINT); raise(SIGINT);
} }
#if 0
static void validate_sat(hilbert_basis& hb) { static void validate_sat(hilbert_basis& hb) {
ast_manager m; ast_manager m;
reg_decl_plugins(m); reg_decl_plugins(m);
@ -239,6 +240,7 @@ static void validate_sat(hilbert_basis& hb) {
lbool r = sol->check_sat(0,0); lbool r = sol->check_sat(0,0);
std::cout << r << "\n"; std::cout << r << "\n";
} }
#endif
static void saturate_basis(hilbert_basis& hb) { static void saturate_basis(hilbert_basis& hb) {
signal(SIGINT, on_ctrl_c); signal(SIGINT, on_ctrl_c);

View file

@ -54,7 +54,6 @@ namespace karr {
SASSERT(is_sat == l_true); SASSERT(is_sat == l_true);
dst.reset(); dst.reset();
unsigned basis_size = hb.get_basis_size(); unsigned basis_size = hb.get_basis_size();
bool first_initial = true;
for (unsigned i = 0; i < basis_size; ++i) { for (unsigned i = 0; i < basis_size; ++i) {
bool is_initial; bool is_initial;
vector<rational> soln; vector<rational> soln;
@ -165,6 +164,7 @@ namespace karr {
return v; return v;
} }
#if 0
static vector<rational> V(int i, int j, int k, int l, int m) { static vector<rational> V(int i, int j, int k, int l, int m) {
vector<rational> v; vector<rational> v;
v.push_back(rational(i)); v.push_back(rational(i));
@ -174,6 +174,7 @@ namespace karr {
v.push_back(rational(m)); v.push_back(rational(m));
return v; return v;
} }
#endif
static vector<rational> V(int i, int j, int k, int l, int x, int y, int z) { static vector<rational> V(int i, int j, int k, int l, int x, int y, int z) {
vector<rational> v; vector<rational> v;