thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Fix warning about shadowing class members

Browse source
This commit is contained in:
Eugene Sandulenko 2016-05-28 17:18:17 +02:00
parent 8fc736fb2d
commit 31913eee17
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/str.cpp
View file

@ -447,12 +447,12 @@ void String::replace(uint32 pos, uint32 count, const char *str) {
replace(pos, count, str, 0, strlen(str));
}
void String::replace(iterator begin, iterator end, const String &str) {
replace(begin - _str, end - begin, str._str, 0, str._size);
void String::replace(iterator begin_, iterator end_, const String &str) {
replace(begin_ - _str, end_ - begin_, str._str, 0, str._size);
}
void String::replace(iterator begin, iterator end, const char *str) {
replace(begin - _str, end - begin, str, 0, strlen(str));
void String::replace(iterator begin_, iterator end_, const char *str) {
replace(begin_ - _str, end_ - begin_, str, 0, strlen(str));
}
void String::replace(uint32 posOri, uint32 countOri, const String &str,