TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-14 15:06:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

More std::vector fixes

Browse Source
This commit is contained in:
Baptiste Wicht 2016-10-03 20:07:31 +02:00
parent 0455a8b3c4
commit 989220d5b4
No known key found for this signature in database
GPG Key ID: C5566B6C7F884532
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tstl/include/vector.hpp
View File

@ -46,7 +46,10 @@ struct vector {
* \brief Construct a vector containing the given values * \brief Construct a vector containing the given values
*/ */
vector(initializer_list<T> values) : data(allocate(values.size())), _size(values.size()), _capacity(values.size()) { vector(initializer_list<T> values) : data(allocate(values.size())), _size(values.size()), _capacity(values.size()) {
std::copy(values.begin(), values.end(), begin()); size_t i = 0;
for(auto& v : values){
new (&data[i++]) value_type(v);
}
} }
vector(const vector& rhs) : data(nullptr), _size(rhs._size), _capacity(rhs._capacity) { vector(const vector& rhs) : data(nullptr), _size(rhs._size), _capacity(rhs._capacity) {
@ -60,21 +63,23 @@ struct vector {
} }
vector& operator=(const vector& rhs){ vector& operator=(const vector& rhs){
if(_capacity < rhs._capacity){ if (this != &rhs) {
if(data){ if (_capacity < rhs._capacity) {
release(); if (data) {
release();
}
_capacity = rhs._capacity;
data = allocate(_capacity);
} else {
destruct_all();
} }
_capacity = rhs._capacity; _size = rhs._size;
data = allocate(_capacity);
} else {
destruct_all();
}
_size = rhs._size; for (size_t i = 0; i < _size; ++i) {
new (&data[i]) value_type(rhs.data[i]);
for(size_t i = 0; i < _size; ++i){ }
new (&data[i]) value_type(rhs.data[i]);
} }
return *this; return *this;
@ -89,16 +94,19 @@ struct vector {
}; };
vector& operator=(vector&& rhs){ vector& operator=(vector&& rhs){
if(data){ if (this != &rhs) {
release(); if (data) {
} release();
}
data = rhs.data; data = rhs.data;
_size = rhs._size; _size = rhs._size;
_capacity = rhs._capacity; _capacity = rhs._capacity;
rhs.data = nullptr;
rhs._size = 0; rhs.data = nullptr;
rhs._capacity = 0; rhs._size = 0;
rhs._capacity = 0;
}
return *this; return *this;
} }
@ -230,7 +238,7 @@ struct vector {
value_type& emplace_back(){ value_type& emplace_back(){
ensure_capacity(_size + 1); ensure_capacity(_size + 1);
new (&data[_size++]) T(); new (&data[_size++]) value_type();
return back(); return back();
} }
@ -239,7 +247,7 @@ struct vector {
value_type& emplace_back(Args... args){ value_type& emplace_back(Args... args){
ensure_capacity(_size + 1); ensure_capacity(_size + 1);
new (&data[_size++]) T{std::forward<Args>(args)...}; new (&data[_size++]) value_type{std::forward<Args>(args)...};
return back(); return back();
} }
@ -398,11 +406,11 @@ struct vector {
private: private:
static value_type* allocate(size_t n){ static value_type* allocate(size_t n){
return reinterpret_cast<value_type*>(new char[n * sizeof(value_type)]); return reinterpret_cast<value_type*>(new uint8_t[n * sizeof(value_type)]);
} }
static void deallocate(value_type* ptr){ static void deallocate(value_type* ptr){
delete[] reinterpret_cast<char*>(ptr); delete[] reinterpret_cast<uint8_t*>(ptr);
} }
void destruct_all(){ void destruct_all(){
@ -434,7 +442,11 @@ private:
} }
auto new_data = allocate(_capacity); auto new_data = allocate(_capacity);
std::move_n(data, _size, new_data);
// Move the old data into the new one
for(size_t i = 0; i < _size; ++i){
new (&new_data[i]) value_type(std::move(data[i]));
}
release(); release();