mirror of
https://github.com/Z3Prover/z3
synced 2026-07-05 14:56:11 +00:00
Fix MacOS CMake build: guard override with #ifdef Z3DEBUG in static_matrix.h, add clang warnings
This commit is contained in:
parent
17b85cbe20
commit
222a5a467b
2 changed files with 14 additions and 3 deletions
|
|
@ -20,6 +20,9 @@ set(CLANG_ONLY_WARNINGS
|
||||||
"-Wno-c++98-compat"
|
"-Wno-c++98-compat"
|
||||||
"-Wno-c++98-compat-pedantic"
|
"-Wno-c++98-compat-pedantic"
|
||||||
"-Wno-zero-length-array"
|
"-Wno-zero-length-array"
|
||||||
|
"-Wc99-extensions"
|
||||||
|
"-Wsuggest-override"
|
||||||
|
"-Winconsistent-missing-override"
|
||||||
)
|
)
|
||||||
set(MSVC_WARNINGS "/W3")
|
set(MSVC_WARNINGS "/W3")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -119,9 +119,13 @@ public:
|
||||||
|
|
||||||
void init_empty_matrix(unsigned m, unsigned n);
|
void init_empty_matrix(unsigned m, unsigned n);
|
||||||
|
|
||||||
|
#ifdef Z3DEBUG
|
||||||
|
unsigned row_count() const override { return static_cast<unsigned>(m_rows.size()); }
|
||||||
|
unsigned column_count() const override { return static_cast<unsigned>(m_columns.size()); }
|
||||||
|
#else
|
||||||
unsigned row_count() const { return static_cast<unsigned>(m_rows.size()); }
|
unsigned row_count() const { return static_cast<unsigned>(m_rows.size()); }
|
||||||
|
|
||||||
unsigned column_count() const { return static_cast<unsigned>(m_columns.size()); }
|
unsigned column_count() const { return static_cast<unsigned>(m_columns.size()); }
|
||||||
|
#endif
|
||||||
|
|
||||||
unsigned lowest_row_in_column(unsigned col);
|
unsigned lowest_row_in_column(unsigned col);
|
||||||
|
|
||||||
|
|
@ -197,7 +201,11 @@ public:
|
||||||
|
|
||||||
void cross_out_row_from_column(unsigned col, unsigned k);
|
void cross_out_row_from_column(unsigned col, unsigned k);
|
||||||
|
|
||||||
|
#ifdef Z3DEBUG
|
||||||
|
T get_elem(unsigned i, unsigned j) const override;
|
||||||
|
#else
|
||||||
T get_elem(unsigned i, unsigned j) const;
|
T get_elem(unsigned i, unsigned j) const;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
unsigned number_of_non_zeroes_in_column(unsigned j) const { return static_cast<unsigned>(m_columns[j].size()); }
|
unsigned number_of_non_zeroes_in_column(unsigned j) const { return static_cast<unsigned>(m_columns[j].size()); }
|
||||||
|
|
@ -218,8 +226,8 @@ public:
|
||||||
#ifdef Z3DEBUG
|
#ifdef Z3DEBUG
|
||||||
unsigned get_number_of_rows() const { return row_count(); }
|
unsigned get_number_of_rows() const { return row_count(); }
|
||||||
unsigned get_number_of_columns() const { return column_count(); }
|
unsigned get_number_of_columns() const { return column_count(); }
|
||||||
virtual void set_number_of_rows(unsigned /*m*/) { }
|
void set_number_of_rows(unsigned /*m*/) override { }
|
||||||
virtual void set_number_of_columns(unsigned /*n*/) { }
|
void set_number_of_columns(unsigned /*n*/) override { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
T get_balance() const;
|
T get_balance() const;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue