zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
No known key found for this signature in database
GPG Key ID: 665DBCD284F7DAFF
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/serialize.h
View File

@ -442,7 +442,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)
@ -916,9 +916,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>