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-24 11:13:00 +08:00
parent cf7118a972
commit 0b05edf26e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TinySTL/String.h
View File

@@ -528,9 +528,12 @@ namespace TinySTL{
} }
size_t string::find(const char* s, size_t pos, size_t n) const{ size_t string::find(const char* s, size_t pos, size_t n) const{
size_t lenghtOfS = strlen(s); size_t lenghtOfS = strlen(s);
if (n < lenghtOfS) //if (n < lenghtOfS)
return npos; // return npos;
return find_aux(s, pos, lenghtOfS, pos + n); //return find_aux(s, pos, lenghtOfS, pos + n);
//bug fix
//2014.12.24
return find_aux(s, pos, n, size());
} }
size_t string::find(const string& str, size_t pos) const{ size_t string::find(const string& str, size_t pos) const{
size_t lengthOfS = str.size(); size_t lengthOfS = str.size();
@@ -539,7 +542,10 @@ namespace TinySTL{
return find_aux(str.cbegin(), pos, lengthOfS, size()); return find_aux(str.cbegin(), pos, lengthOfS, size());
} }
size_t string::find(const char* s, size_t pos) const{ size_t string::find(const char* s, size_t pos) const{
return find(s, pos, size() - pos); //return find(s, pos, size() - pos);
//bug fix
//2014.12.24
return find(s, pos, strlen(s));
} }
size_t string::find(char c, size_t pos) const{ size_t string::find(char c, size_t pos) const{
for (auto cit = cbegin() + pos; cit != cend(); ++cit){ for (auto cit = cbegin() + pos; cit != cend(); ++cit){