Skip to content

Commit 249cc9d

Browse files
committed
Avoid -Wshadow errors
Suggested by Pavel Janik. backports bitcoin/bitcoin@a603925
1 parent 8e1ec9e commit 249cc9d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/serialize.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ class LimitedString
489489
std::string& string;
490490

491491
public:
492-
LimitedString(std::string& string) : string(string) {}
492+
LimitedString(std::string& _string) : string(_string) {}
493493

494494
template <typename Stream>
495495
void Unserialize(Stream& s)
@@ -855,9 +855,9 @@ class CSizeComputer
855855
public:
856856
CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}
857857

858-
void write(const char* psz, size_t nSize)
858+
void write(const char* psz, size_t _nSize)
859859
{
860-
this->nSize += nSize;
860+
this->nSize += _nSize;
861861
}
862862

863863
/** Pretend _nSize bytes are written, without specifying them. */

0 commit comments

Comments
 (0)