Avoid -Wshadow errors

Suggested by Pavel Janik.
This commit is contained in:
Pieter Wuille
2016-10-30 13:09:20 -07:00
committed by Jack Grigg
parent 68a1a592ca
commit 9b228f0391

View File

@@ -442,7 +442,7 @@ class LimitedString
protected:
std::string& string;
public:
LimitedString(std::string& string) : string(string) {}
LimitedString(std::string& _string) : string(_string) {}
template<typename Stream>
void Unserialize(Stream& s)
@@ -916,9 +916,9 @@ protected:
public:
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>