diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-09-27 13:25:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-27 13:25:54 +0200 |
| commit | 920ca1f0bf0b786250e3119a05984e0c2af1350a (patch) | |
| tree | 72ffd41a7d512d1a71dd6e8701c3bcb7f9849d5a /src/test/net_tests.cpp | |
| parent | Merge #8803: Ping regularly in p2p-segwit.py to keep connection alive (diff) | |
| parent | Do not shadow variables (diff) | |
| download | discoin-920ca1f0bf0b786250e3119a05984e0c2af1350a.tar.xz discoin-920ca1f0bf0b786250e3119a05984e0c2af1350a.zip | |
Merge #8655: Do not shadow variables (trivials)
4731cab Do not shadow variables (Pavel JanÃk)
Diffstat (limited to 'src/test/net_tests.cpp')
| -rw-r--r-- | src/test/net_tests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp index 680708533..4a7d6e778 100644 --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -62,11 +62,11 @@ public: } }; -CDataStream AddrmanToStream(CAddrManSerializationMock& addrman) +CDataStream AddrmanToStream(CAddrManSerializationMock& _addrman) { CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION); ssPeersIn << FLATDATA(Params().MessageStart()); - ssPeersIn << addrman; + ssPeersIn << _addrman; std::string str = ssPeersIn.str(); vector<unsigned char> vchData(str.begin(), str.end()); return CDataStream(vchData, SER_DISK, CLIENT_VERSION); |