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

bug fix

Browse Source
This commit is contained in:
邹晓航
2014-12-25 10:43:01 +08:00
parent a824e5035c
commit 8e5cf5623e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TinySTL/String.h
View File

@@ -673,16 +673,24 @@ namespace TinySTL{
} }
size_t string::find_last_of(const string& str, size_t pos) const{ size_t string::find_last_of(const string& str, size_t pos) const{
pos = changeVarWhenEuqalNPOS(pos, size(), 1); pos = changeVarWhenEuqalNPOS(pos, size(), 1);
return find_last_of(str.begin(), pos, pos + 1); //return find_last_of(str.begin(), pos, pos + 1);
return find_last_of(str.begin(), pos, str.size());
} }
size_t string::find_last_of(const char* s, size_t pos) const{ size_t string::find_last_of(const char* s, size_t pos) const{
pos = changeVarWhenEuqalNPOS(pos, size(), 1); pos = changeVarWhenEuqalNPOS(pos, size(), 1);
return find_last_of(s, pos, pos + 1); //return find_last_of(s, pos, pos + 1);
return find_last_of(s, pos, strlen(s));
} }
size_t string::find_last_of(const char* s, size_t pos, size_t n) const{ size_t string::find_last_of(const char* s, size_t pos, size_t n) const{
for (size_t i = pos, j = 0; i >= 0 && j != n; --i, ++j){ /*for (size_t i = pos, j = 0; i >= 0 && j != n; --i, ++j){
if (isContained((*this)[i], s, s + strlen(s))) if (isContained((*this)[i], s, s + strlen(s)))
return i; return i;
}*/
//bug fix
//2014.12.25
for (size_t i = pos; i > 0; --i){
if (isContained((*this)[i], s, s + n))
return i;
} }
return npos; return npos;
} }