Skip to content

Commit

Permalink
Avoid -Wshadow errors
Browse files Browse the repository at this point in the history
Suggested by Pavel Janik.
  • Loading branch information
sipa committed Nov 7, 2016
1 parent 5284721 commit a603925
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/serialize.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -810,9 +810,9 @@ class CSizeComputer
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>
Expand Down

0 comments on commit a603925

Please sign in to comment.