From 272399bebc5e0d758ac6613e911832d178557438 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Fri, 21 Mar 2014 14:29:21 -0700 Subject: [PATCH] fixing compiler errors Signed-off-by: Nikolaj Bjorner --- src/math/simplex/simplex.h | 2 +- src/math/simplex/sparse_matrix.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/math/simplex/simplex.h b/src/math/simplex/simplex.h index 26d471246..f5c3a4243 100644 --- a/src/math/simplex/simplex.h +++ b/src/math/simplex/simplex.h @@ -50,7 +50,7 @@ namespace simplex { typedef typename Ext::eps_manager eps_manager; typedef typename Ext::scoped_numeral scoped_numeral; typedef _scoped_numeral scoped_eps_numeral; - typedef typename _scoped_numeral_vector scoped_eps_numeral_vector; + typedef _scoped_numeral_vector scoped_eps_numeral_vector; typedef sparse_matrix matrix; struct var_lt { bool operator()(var_t v1, var_t v2) const { return v1 < v2; } diff --git a/src/math/simplex/sparse_matrix.h b/src/math/simplex/sparse_matrix.h index b0b77d4dc..5ffa78bc9 100644 --- a/src/math/simplex/sparse_matrix.h +++ b/src/math/simplex/sparse_matrix.h @@ -63,7 +63,7 @@ namespace simplex { }; _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) {} - 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); class row_iterator { - friend sparse_matrix; + friend class sparse_matrix; unsigned m_curr; _row & m_row; void move_to_used() { @@ -202,7 +202,7 @@ namespace simplex { unsigned column_size(var_t v) const { return m_columns[v].size(); } class col_iterator { - friend sparse_matrix; + friend class sparse_matrix; unsigned m_curr; column const& m_col; vector<_row> const& m_rows;