diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-03 15:48:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-03 15:48:53 +0100 |
| commit | 75d012e8c7d0b2dfec0fe34807eabb4f661f4fb7 (patch) | |
| tree | 068cbf16562b5cfbb1887ffb55385a5f12b76059 /src/chain.h | |
| parent | ba80a684cfef95233330de58af92ec4baec875fd (diff) | |
| parent | ad1ae7ae2e90a29fcfaaddee2d5acd025de72cbe (diff) | |
Merge #8808: Do not shadow variables (gcc set)
ad1ae7a Check and enable -Wshadow by default. (Pavel Janík)
9de90bb Do not shadow variables (gcc set) (Pavel Janík)
Tree-SHA512: 9517feb423dc8ddd63896016b25324673bfbe0bffa97f22996f59d7a3fcbdc2ebf2e43ac02bc067546f54e293e9b2f2514be145f867321e9031f895c063d9fb8
Diffstat (limited to 'src/chain.h')
| -rw-r--r-- | src/chain.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chain.h b/src/chain.h index acb29b667b..4fd5aed93b 100644 --- a/src/chain.h +++ b/src/chain.h @@ -367,9 +367,9 @@ public: template <typename Stream, typename Operation> inline void SerializationOp(Stream& s, Operation ser_action) { - int nVersion = s.GetVersion(); + int _nVersion = s.GetVersion(); if (!(s.GetType() & SER_GETHASH)) - READWRITE(VARINT(nVersion)); + READWRITE(VARINT(_nVersion)); READWRITE(VARINT(nHeight)); READWRITE(VARINT(nStatus)); |