mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

fix build errors

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-01 09:05:20 -07:00
parent 5ba814b14f
commit a91d7a7189
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sat/ba_solver.cpp
View file

@ -1035,10 +1035,10 @@ namespace sat {
}
if (coeff0 > 0 && inc < 0) {
inc_bound(std::max(0LL, coeff1) - coeff0);
inc_bound(std::max((int64_t)0, coeff1) - coeff0);
}
else if (coeff0 < 0 && inc > 0) {
inc_bound(coeff0 - std::min(0LL, coeff1));
inc_bound(coeff0 - std::min((int64_t)0, coeff1));
}
int64_t lbound = static_cast<int64_t>(m_bound);

4
src/sat/sat_allocator.h
View file

@ -32,11 +32,11 @@ class sat_allocator {
char m_data[CHUNK_SIZE];
chunk():m_curr(m_data) {}
};
char const * m_id;
size_t m_alloc_size;
ptr_vector<chunk> m_chunks;
void * m_chunk_ptr;
ptr_vector<void> m_free[NUM_FREE];
size_t m_alloc_size;
char const * m_id;
unsigned align_size(size_t sz) const {
return free_slot_id(sz) << PTR_ALIGNMENT;

1
src/sat/sat_lookahead.h
View file

@ -33,7 +33,6 @@ namespace sat {
};
inline std::ostream& operator<<(std::ostream& out, pp_prefix const& p) {
uint64_t q = p.m_prefix;
unsigned d = std::min(63u, p.m_depth);
for (unsigned i = 0; i <= d; ++i) {
if (0 != (p.m_prefix & (1ull << i))) out << "1"; else out << "0";