Avoid -Wshadow errors
Suggested by Pavel Janik.
This commit is contained in:
parent
528472111b
commit
a603925c77
1 changed files with 3 additions and 3 deletions
|
@ -438,7 +438,7 @@ class LimitedString
|
||||||
protected:
|
protected:
|
||||||
std::string& string;
|
std::string& string;
|
||||||
public:
|
public:
|
||||||
LimitedString(std::string& string) : string(string) {}
|
LimitedString(std::string& _string) : string(_string) {}
|
||||||
|
|
||||||
template<typename Stream>
|
template<typename Stream>
|
||||||
void Unserialize(Stream& s)
|
void Unserialize(Stream& s)
|
||||||
|
@ -810,9 +810,9 @@ protected:
|
||||||
public:
|
public:
|
||||||
CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
|
CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
|
||||||
|
|
||||||
void write(const char *psz, size_t nSize)
|
void write(const char *psz, size_t _nSize)
|
||||||
{
|
{
|
||||||
this->nSize += nSize;
|
this->nSize += _nSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
|
Loading…
Reference in a new issue