From 9b228f0391792b5399b3cebdb1cf2aef853a909a Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Sun, 30 Oct 2016 13:09:20 -0700 Subject: [PATCH] Avoid -Wshadow errors Suggested by Pavel Janik. --- src/serialize.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/serialize.h b/src/serialize.h index 2bb80f822..3b100481d 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -442,7 +442,7 @@ class LimitedString protected: std::string& string; public: - LimitedString(std::string& string) : string(string) {} + LimitedString(std::string& _string) : string(_string) {} template 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