mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-03 11:25:40 +00:00
Code Activity

fix merge failure

Browse source
This commit is contained in:
Jakob Rath 2023-12-18 11:38:16 +01:00
parent 734c44b004
commit b279df7f85
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/util/dlist.h
View file

@ -232,7 +232,6 @@ public:
dll_iterator<T> end() const { return dll_iterator<T>::mk_end(m_list); } dll_iterator<T> end() const { return dll_iterator<T>::mk_end(m_list); }
}; };
template < typename T template < typename T
, typename U = std::enable_if_t<std::is_base_of_v<dll_base<T>, T>> // should only match if T actually inherits from dll_base<T> , typename U = std::enable_if_t<std::is_base_of_v<dll_base<T>, T>> // should only match if T actually inherits from dll_base<T>
> >
@ -247,12 +246,3 @@ dll_iterator<T> end(T const& list)
{ {
return dll_iterator<T>::mk_end(&list); return dll_iterator<T>::mk_end(&list);
} }
template <typename T>
class dll_elements {
T const* m_list;
public:
dll_elements(T const* list): m_list(list) {}
dll_iterator<T> begin() const { return dll_iterator<T>::mk_begin(m_list); }
dll_iterator<T> end() const { return dll_iterator<T>::mk_end(m_list); }
};

2
src/util/tbv.h
View file

@ -128,7 +128,7 @@ private:
return (fixed_bit_vector::get(index) << 1) | (unsigned)fixed_bit_vector::get(index+1); return (fixed_bit_vector::get(index) << 1) | (unsigned)fixed_bit_vector::get(index+1);
} }
}; };
class tbv_ref { class tbv_ref {
tbv_manager& mgr; tbv_manager& mgr;
tbv* d; tbv* d;