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:24:07 +08:00
parent 72f6ed789b
commit a824e5035c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
TinySTL/String.h
View File

@@ -628,14 +628,22 @@ namespace TinySTL{
return compare_aux(pos, len, s, 0, n);
}
size_t string::find_first_of(const string& str, size_t pos) const{
return find_first_of(str.begin(), pos, size() - pos);
//return find_first_of(str.begin(), pos, size() - pos);
return find_first_of(str.begin(), pos, str.size());
}
size_t string::find_first_of(const char* s, size_t pos) const{
return find_first_of(s, pos, size() - pos);
//return find_first_of(s, pos, size() - pos);
return find_first_of(s, pos, strlen(s));
}
size_t string::find_first_of(const char* s, size_t pos, size_t n) const{
for (size_t i = pos; i != pos + n; ++i){
if (isContained((*this)[i], s, s + strlen(s)))
//for (size_t i = pos; i != pos + n; ++i){
// if (isContained((*this)[i], s, s + strlen(s)))
// return i;
//}
//bug fix
//2014.12.25
for (size_t i = pos; i != size(); ++i){
if (isContained((*this)[i], s, s + n))
return i;
}
return npos;