From a91d7a71894dab192005634f4df5b0bb194bdf56 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Tue, 1 May 2018 09:05:20 -0700 Subject: [PATCH] fix build errors Signed-off-by: Nikolaj Bjorner --- src/sat/ba_solver.cpp | 4 ++-- src/sat/sat_allocator.h | 4 ++-- src/sat/sat_lookahead.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/sat/ba_solver.cpp b/src/sat/ba_solver.cpp index 90f737109..d94b02c8d 100644 --- a/src/sat/ba_solver.cpp +++ b/src/sat/ba_solver.cpp @@ -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(m_bound); diff --git a/src/sat/sat_allocator.h b/src/sat/sat_allocator.h index 1cbef04e0..b4e9f82e6 100644 --- a/src/sat/sat_allocator.h +++ b/src/sat/sat_allocator.h @@ -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 m_chunks; void * m_chunk_ptr; ptr_vector 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; diff --git a/src/sat/sat_lookahead.h b/src/sat/sat_lookahead.h index d03ceb64a..78cd32082 100644 --- a/src/sat/sat_lookahead.h +++ b/src/sat/sat_lookahead.h @@ -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";