-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
z3_4_{8_5,8,11,12}: fix clang-19 build
Original commit message by Reno Dakota (https://github.com/paparodeo), rebased against latest z3 changes: z3 contains a bunch of typos in never used functions. The update to clang-19 now reports the typos -- wrong member function / variable names. There is an upstream patch which fixes some of these: Z3Prover/z3@2ce89e5 And the others we patch or remove as the upstream code has since been modified.
- Loading branch information
Showing
4 changed files
with
109 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/src/util/lp/lp_core_solver_base.h b/src/util/lp/lp_core_solver_base.h | ||
index 4c17df2..4c3c311 100644 | ||
--- a/src/util/lp/lp_core_solver_base.h | ||
+++ b/src/util/lp/lp_core_solver_base.h | ||
@@ -600,8 +600,6 @@ public: | ||
out << " \n"; | ||
} | ||
|
||
- bool column_is_free(unsigned j) const { return this->m_column_type[j] == free; } | ||
- | ||
bool column_has_upper_bound(unsigned j) const { | ||
switch(m_column_types[j]) { | ||
case column_type::free_column: | ||
diff --git a/src/util/lp/static_matrix_def.h b/src/util/lp/static_matrix_def.h | ||
index 7949573..2f1cb42 100644 | ||
--- a/src/util/lp/static_matrix_def.h | ||
+++ b/src/util/lp/static_matrix_def.h | ||
@@ -86,7 +86,7 @@ static_matrix<T, X>::static_matrix(static_matrix const &A, unsigned * /* basis * | ||
init_row_columns(m, m); | ||
while (m--) { | ||
for (auto & col : A.m_columns[m]){ | ||
- set(col.var(), m, A.get_value_of_column_cell(col)); | ||
+ set(col.var(), m, A.get_column_cell(col)); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/src/@dir@/lp/column_info.h b/src/@dir@/lp/column_info.h | ||
index 1dc0c60..9cbeea6 100644 | ||
--- a/src/@dir@/lp/column_info.h | ||
+++ b/src/@dir@/lp/column_info.h | ||
@@ -47,7 +47,7 @@ public: | ||
m_lower_bound_is_strict == c.m_lower_bound_is_strict && | ||
m_upper_bound_is_set == c.m_upper_bound_is_set&& | ||
m_upper_bound_is_strict == c.m_upper_bound_is_strict&& | ||
- (!m_lower_bound_is_set || m_lower_bound == c.m_low_bound) && | ||
+ (!m_lower_bound_is_set || m_lower_bound == c.m_lower_bound) && | ||
(!m_upper_bound_is_set || m_upper_bound == c.m_upper_bound) && | ||
m_cost == c.m_cost && | ||
m_is_fixed == c.m_is_fixed && |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/src/@dir@/lp/tail_matrix.h b/src/@dir@/lp/tail_matrix.h | ||
index 2047e8c..c84340e 100644 | ||
--- a/src/@dir@/lp/tail_matrix.h | ||
+++ b/src/@dir@/lp/tail_matrix.h | ||
@@ -43,7 +43,6 @@ public: | ||
const tail_matrix & m_A; | ||
unsigned m_row; | ||
ref_row(const tail_matrix& m, unsigned row): m_A(m), m_row(row) {} | ||
- T operator[](unsigned j) const { return m_A.get_elem(m_row, j);} | ||
}; | ||
ref_row operator[](unsigned i) const { return ref_row(*this, i);} | ||
}; |