mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-22 19:17:53 +00:00
Code Activity

Merge branch 'master' into polysat

Browse source
This commit is contained in:
Jakob Rath 2022-08-02 11:31:01 +02:00
commit e105a91d4a
18 changed files with 41 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/util/array.h
View file

@ -37,8 +37,6 @@ private:
char * raw_ptr() const { return reinterpret_cast<char*>(reinterpret_cast<size_t*>(m_data) - 1); }
array & operator=(array const & source);
void set_data(void * mem, unsigned sz) {
size_t * _mem = static_cast<size_t*>(mem);
*_mem = sz;
@ -115,6 +113,8 @@ public:
destroy_elements();
}
array & operator=(array const & source) = delete;
// Free the memory used to store the array.
template<typename Allocator>
void finalize(Allocator & a) {

2
src/util/memory_manager.cpp
View file

@ -215,7 +215,7 @@ void * memory::allocate(char const* file, int line, char const* obj, size_t s) {
}
#endif
#if !defined(SINGLE_THREAD) && (defined(_WINDOWS) || defined(_USE_THREAD_LOCAL))
#if !defined(SINGLE_THREAD)
// ==================================
// ==================================
// THREAD LOCAL VERSION

9
src/util/mpz.h
View file

@ -44,7 +44,7 @@ typedef unsigned digit_t;
template<bool SYNCH> class mpz_manager;
template<bool SYNCH> class mpq_manager;
#if !defined(_MP_GMP) && !defined(_MP_MSBIGNUM) && !defined(_MP_INTERNAL)
#if !defined(_MP_GMP) && !defined(_MP_INTERNAL)
#ifdef _WINDOWS
#define _MP_INTERNAL
#else
@ -52,13 +52,8 @@ template<bool SYNCH> class mpq_manager;
#endif
#endif
#if defined(_MP_MSBIGNUM)
typedef size_t digit_t;
#elif defined(_MP_INTERNAL)
typedef unsigned int digit_t;
#endif
#ifndef _MP_GMP
typedef unsigned int digit_t;
class mpz_cell {
unsigned m_size;
unsigned m_capacity;

3
src/util/params.h
View file

@ -35,13 +35,14 @@ class params_ref {
params * m_params;
void init();
void copy_core(params const * p);
params_ref& operator=(params_ref const& p) = delete;
void set(params_ref const& p);
public:
params_ref():m_params(nullptr) {}
params_ref(params_ref const & p);
~params_ref();
params_ref& operator=(params_ref const& p) = delete;
static params_ref const & get_empty() { return g_empty_params_ref; }

3
src/util/scoped_numeral_buffer.h
View file

@ -24,13 +24,14 @@ template<typename Manager, unsigned INITIAL_SIZE = 16>
class _scoped_numeral_buffer : public sbuffer<typename Manager::numeral, INITIAL_SIZE> {
typedef sbuffer<typename Manager::numeral, INITIAL_SIZE> super;
Manager & m_manager;
_scoped_numeral_buffer(_scoped_numeral_buffer const & v);
public:
_scoped_numeral_buffer(Manager & m):m_manager(m) {}
~_scoped_numeral_buffer() {
reset();
}
_scoped_numeral_buffer(_scoped_numeral_buffer const & v) = delete;
void reset() {
unsigned sz = this->size();
for (unsigned i = 0; i < sz; i++) {