mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

make vector friendly to gcc < 5

Browse source
This commit is contained in:
Nuno Lopes 2017-10-15 23:36:00 +01:00
parent 6cefb700ac
commit 2905bdebef
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/util/vector.h
View file

@ -76,25 +76,26 @@ class vector {
throw default_exception("Overflow encountered when expanding vector"); throw default_exception("Overflow encountered when expanding vector");
} }
SZ *mem, *old_mem = reinterpret_cast<SZ*>(m_data) - 2; SZ *mem, *old_mem = reinterpret_cast<SZ*>(m_data) - 2;
#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
if (__has_trivial_copy(T)) {
#else
if (std::is_trivially_copyable<T>::value) { if (std::is_trivially_copyable<T>::value) {
#endif
mem = (SZ*)memory::reallocate(old_mem, new_capacity_T); mem = (SZ*)memory::reallocate(old_mem, new_capacity_T);
m_data = reinterpret_cast<T *>(mem + 2);
} else { } else {
mem = (SZ*)memory::allocate(new_capacity_T); mem = (SZ*)memory::allocate(new_capacity_T);
} auto old_data = m_data;
auto old_data = m_data; auto old_size = size();
auto old_size = size();
*mem = new_capacity;
m_data = reinterpret_cast<T *>(mem + 2);
if (!std::is_trivially_copyable<T>::value) {
static_assert(std::is_move_constructible<T>::value, "");
mem[1] = old_size; mem[1] = old_size;
int i = 0; m_data = reinterpret_cast<T *>(mem + 2);
for (auto I = old_data; I != old_data + old_size; ++I) { for (unsigned i = 0; i < old_size; ++i) {
new (&m_data[i++]) T(std::move(*I)); new (&m_data[i]) T(std::move(old_data[i]));
I->~T(); old_data[i].~T();
} }
memory::deallocate(old_mem); memory::deallocate(old_mem);
} }
*mem = new_capacity;
} }
} }