TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-11 05:24:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactorings

Browse Source
This commit is contained in:
Baptiste Wicht 2018-04-05 16:34:06 +02:00
parent 9dd92aa5a5
commit 71bf65e0fd
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tstl/include/string.hpp
View File

@ -535,20 +535,7 @@ public:
set_size(n); set_size(n);
auto need = n + 1; ensure_capacity(n + 1, false);
if(capacity() < need){
auto capacity = need;
if(is_small()){
new (&storage.big) base_long<CharT>(capacity, new CharT[capacity]);
set_small(false);
} else {
storage.big.capacity = capacity;
storage.big.data.reset(new CharT[capacity]);
}
}
std::copy(it, end, begin()); std::copy(it, end, begin());
data_ptr()[size()] = '\0'; data_ptr()[size()] = '\0';
@ -558,7 +545,7 @@ public:
private: private:
void ensure_capacity(size_t new_capacity){ void ensure_capacity(size_t new_capacity, bool preserve = true){
if(new_capacity > 0 && (capacity() < new_capacity)){ if(new_capacity > 0 && (capacity() < new_capacity)){
auto new_cap = capacity() * 2; auto new_cap = capacity() * 2;
@ -568,7 +555,9 @@ private:
auto new_data = new CharT[new_cap]; auto new_data = new CharT[new_cap];
std::copy_n(begin(), size() + 1, new_data); if(preserve){
std::copy_n(begin(), size() + 1, new_data);
}
if(is_small()){ if(is_small()){
new (&storage.big) base_long<CharT>(new_cap, new_data); new (&storage.big) base_long<CharT>(new_cap, new_data);
@ -601,27 +590,11 @@ private:
return *this; return *this;
} }
//TODO Cleanup the duplication with ensure_capacity()
//Make sure to avoid the unecessary copy
template<typename T> template<typename T>
basic_string& base_assign(const T& rhs){ basic_string& base_assign(const T& rhs){
set_size(rhs.size()); set_size(rhs.size());
auto need = rhs.size() + 1; ensure_capacity(rhs.size() + 1, false);
if(capacity() < need){
auto capacity = need;
if(is_small()){
new (&storage.big) base_long<CharT>(capacity, new CharT[capacity]);
set_small(false);
} else {
storage.big.capacity = capacity;
storage.big.data.reset(new CharT[capacity]);
}
}
std::copy(rhs.begin(), rhs.end(), begin()); std::copy(rhs.begin(), rhs.end(), begin());
data_ptr()[size()] = '\0'; data_ptr()[size()] = '\0';