diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-30 13:09:20 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-11-07 13:56:27 -0800 |
| commit | a603925c77d7cd15c03d8028414c8917347e81b7 (patch) | |
| tree | 44bd42c2214fc987d20459d2f2609cbde289729b /src/serialize.h | |
| parent | 528472111b4965b1a99c4bcf08ac5ec93d87f10f (diff) | |
Avoid -Wshadow errors
Suggested by Pavel Janik.
Diffstat (limited to 'src/serialize.h')
| -rw-r--r-- | src/serialize.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/serialize.h b/src/serialize.h index fc4291fe95..d26d2d52e6 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -438,7 +438,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) @@ -810,9 +810,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> |