PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly make vector::operator= not inline 

Former-commit-id: 47163e0f4e
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-31 22:30:15 +02:00
parent a2260d9e4f
commit f7e6ddea87
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/rstl/vector.hpp
View File

@ -77,22 +77,7 @@ public:
++x4_count;
}
vector& operator=(const vector& other); /* {
if (this == &other)
return *this;
clear();
if (other.size() == 0) {
x0_allocator.deallocate(xc_items);
x4_count = 0;
x8_capacity = 0;
xc_items = nullptr;
} else {
reserve(other.size());
uninitialized_copy(other.data(), other.data() + other.size(), data());
x4_count = other.x4_count;
}
return *this;
}*/
vector& operator=(const vector& other);
void clear() {
destroy(begin(), end());
@ -116,12 +101,12 @@ public:
protected:
template < typename In >
void insert_into(iterator at, int n, In in) {
int insertAt = xc_items + n;
if (x8_capacity < insertAt) {
// int insertAt = xc_items + n;
// TODO: finish
if (x8_capacity < n) {
int newCapacity = x8_capacity != 0 ? x8_capacity * 2 : 4;
T* newData;
x0_allocator.allocate(newData, newCapacity);
}
}
};
@ -160,6 +145,25 @@ typename vector< T, Alloc >::iterator vector< T, Alloc >::insert(iterator it, co
return begin() + diff;
}
template < typename T, typename Alloc >
vector< T, Alloc >& vector< T, Alloc >::operator=(const vector< T, Alloc >& other) {
if (this == &other)
return *this;
clear();
if (other.size() == 0) {
x0_allocator.deallocate(xc_items);
x4_count = 0;
x8_capacity = 0;
xc_items = nullptr;
} else {
reserve(other.size());
uninitialized_copy(other.data(), other.data() + other.size(), data());
x4_count = other.x4_count;
}
return *this;
}
typedef vector< void > unk_vector;
CHECK_SIZEOF(unk_vector, 0x10)
} // namespace rstl