mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-05 02:40:24 +00:00
Code Activity

fixing compiler errors

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-03-21 14:29:21 -07:00
parent 1c7d523838
commit 272399bebc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/math/simplex/simplex.h
View file

@ -50,7 +50,7 @@ namespace simplex {
typedef typename Ext::eps_manager eps_manager; typedef typename Ext::eps_manager eps_manager;
typedef typename Ext::scoped_numeral scoped_numeral; typedef typename Ext::scoped_numeral scoped_numeral;
typedef _scoped_numeral<eps_manager> scoped_eps_numeral; typedef _scoped_numeral<eps_manager> scoped_eps_numeral;
typedef typename _scoped_numeral_vector<eps_manager> scoped_eps_numeral_vector; typedef _scoped_numeral_vector<eps_manager> scoped_eps_numeral_vector;
typedef sparse_matrix<Ext> matrix; typedef sparse_matrix<Ext> matrix;
struct var_lt { struct var_lt {
bool operator()(var_t v1, var_t v2) const { return v1 < v2; } bool operator()(var_t v1, var_t v2) const { return v1 < v2; }

6
src/math/simplex/sparse_matrix.h
View file

@ -63,7 +63,7 @@ namespace simplex {
}; };
_row_entry(numeral const & c, var_t v): row_entry(c, v), m_col_idx(0) {} _row_entry(numeral const & c, var_t v): row_entry(c, v), m_col_idx(0) {}
_row_entry() : row_entry(numeral(), dead_id), m_col_idx(0) {} _row_entry() : row_entry(numeral(), dead_id), m_col_idx(0) {}
bool is_dead() const { return m_var == dead_id; } bool is_dead() const { return row_entry::m_var == dead_id; }
}; };
/** /**
@ -169,7 +169,7 @@ namespace simplex {
void gcd_normalize(row const& r, scoped_numeral& g); void gcd_normalize(row const& r, scoped_numeral& g);
class row_iterator { class row_iterator {
friend sparse_matrix; friend class sparse_matrix;
unsigned m_curr; unsigned m_curr;
_row & m_row; _row & m_row;
void move_to_used() { void move_to_used() {
@ -202,7 +202,7 @@ namespace simplex {
unsigned column_size(var_t v) const { return m_columns[v].size(); } unsigned column_size(var_t v) const { return m_columns[v].size(); }
class col_iterator { class col_iterator {
friend sparse_matrix; friend class sparse_matrix;
unsigned m_curr; unsigned m_curr;
column const& m_col; column const& m_col;
vector<_row> const& m_rows; vector<_row> const& m_rows;