steven/TinySTL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

insert bug fix

Browse Source
This commit is contained in:
邹晓航
2014-10-10 17:57:42 +08:00
parent 66794c1e7b
commit 6f8c977082
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TinySTL/String.h
View File

@@ -298,9 +298,8 @@ namespace TinySTL{
auto lengthOfLeft = capacity() - size(); auto lengthOfLeft = capacity() - size();
size_t lengthOfInsert = last - first; size_t lengthOfInsert = last - first;
if (lengthOfInsert <= lengthOfLeft){ if (lengthOfInsert <= lengthOfLeft){
auto ptr = finish_; for (iterator it = finish_ - 1; it >= p; --it){
for (auto i = lengthOfInsert; i != 0; --i){ *(it + lengthOfInsert) = *(it);
*(finish_ - 1 + i) = *(--ptr);
} }
TinySTL::uninitialized_copy(first, last, p); TinySTL::uninitialized_copy(first, last, p);
finish_ += lengthOfInsert; finish_ += lengthOfInsert;
@@ -346,9 +345,8 @@ namespace TinySTL{
string::iterator string::insert(iterator p, size_t n, char c){ string::iterator string::insert(iterator p, size_t n, char c){
auto lengthOfLeft = capacity() - size(); auto lengthOfLeft = capacity() - size();
if (n <= lengthOfLeft){ if (n <= lengthOfLeft){
auto ptr = finish_; for (iterator it = finish_ - 1; it >= p; --it){
for (auto i = n; i != 0; --i){ *(it + n) = *(it);
*(finish_ - 1 + i) = *(--ptr);
} }
TinySTL::uninitialized_fill_n(p, n, c); TinySTL::uninitialized_fill_n(p, n, c);
finish_ += n; finish_ += n;
@@ -405,6 +403,7 @@ namespace TinySTL{
dataAllocator::destroy(first + lengthOfMove, finish_); dataAllocator::destroy(first + lengthOfMove, finish_);
finish_ = first + lengthOfMove; finish_ = first + lengthOfMove;
return first; return first;
} }
string& string::erase(size_t pos, size_t len){ string& string::erase(size_t pos, size_t len){
erase(begin() + pos, begin() + pos + len); erase(begin() + pos, begin() + pos + len);
@@ -518,8 +517,9 @@ namespace TinySTL{
return rfind_aux(s, pos, lengthOfS, pos - n); return rfind_aux(s, pos, lengthOfS, pos - n);
} }
std::ostream& operator <<(std::ostream& os, const string&str){ std::ostream& operator <<(std::ostream& os, const string&str){
for (const auto ch : str) for (const auto ch : str){
os << ch; os << ch;
}
return os; return os;
} }
} }