drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox/std] Fix HashMap and Vector move operators

Browse Source
This commit is contained in:
Gary Talent
2021-04-22 01:17:57 -05:00
parent 85b101884a
commit 0cf25f3029
2 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
deps/ox/src/ox/std/hashmap.hpp vendored
View File

@@ -81,6 +81,8 @@ class HashMap {
*/
Pair *&access(Vector<Pair*> &pairs, K key);
void clear();
};
template<typename K, typename T>
@@ -96,15 +98,11 @@ template<typename K, typename T>
HashMap<K, T>::HashMap(HashMap<K, T> &&other) {
m_keys = ox::move(other.m_keys);
m_pairs = ox::move(other.m_pairs);
other.m_keys = {};
other.m_pairs = {};
}
template<typename K, typename T>
HashMap<K, T>::~HashMap() {
for (std::size_t i = 0; i < m_pairs.size(); i++) {
delete m_pairs[i];
}
clear();
}
template<typename K, typename T>
@@ -123,19 +121,21 @@ bool HashMap<K, T>::operator==(const HashMap &other) const {
template<typename K, typename T>
HashMap<K, T> &HashMap<K, T>::operator=(const HashMap<K, T> &other) {
this->~HashMap<K, T>();
m_keys = other.m_keys;
m_pairs = other.m_pairs;
if (this != &other) {
clear();
m_keys = other.m_keys;
m_pairs = other.m_pairs;
}
return *this;
}
template<typename K, typename T>
HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) {
this->~HashMap<K, T>();
m_keys = ox::move(other.m_keys);
m_pairs = ox::move(other.m_pairs);
other.m_keys = {};
other.m_pairs = {};
if (this != &other) {
clear();
m_keys = ox::move(other.m_keys);
m_pairs = ox::move(other.m_pairs);
}
return *this;
}
@@ -235,4 +235,12 @@ typename HashMap<K, T>::Pair *&HashMap<K, T>::access(Vector<Pair*> &pairs, K k)
}
}
template<typename K, typename T>
void HashMap<K, T>::clear() {
for (std::size_t i = 0; i < m_pairs.size(); i++) {
delete m_pairs[i];
}
m_pairs.clear();
}
}