LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Packages Projects Releases 32 Wiki Activity

Fix warnings when building with DEBUG_ADDRMAN

Browse source 
Warnings prior to this commit:

```
addrman.cpp:390:24: warning: comparison of integers of different signs: 'size_type' (aka 'unsigned long') and 'int' [-Wsign-compare]
    if (vRandom.size() != nTried + nNew)
        ~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~
addrman.cpp:411:52: warning: comparison of integers of different signs: 'int' and 'size_type' (aka 'unsigned long') [-Wsign-compare]
        if (info.nRandomPos < 0 || info.nRandomPos >= vRandom.size() || vRandom[info.nRandomPos] != n)
                                   ~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~
addrman.cpp:419:25: warning: comparison of integers of different signs: 'size_type' (aka 'unsigned long') and 'int' [-Wsign-compare]
    if (setTried.size() != nTried)
        ~~~~~~~~~~~~~~~ ^  ~~~~~~
addrman.cpp:421:23: warning: comparison of integers of different signs: 'size_type' (aka 'unsigned long') and 'int' [-Wsign-compare]
    if (mapNew.size() != nNew)
        ~~~~~~~~~~~~~ ^  ~~~~
4 warnings generated.
```
This commit is contained in:
practicalswift 2017-10-30 10:29:27 +01:00
parent bb9ab0fccf
commit 6eddd43e6d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/addrman.cpp
View file

@ -387,7 +387,7 @@ int CAddrMan::Check_()
std::set<int> setTried; std::set<int> setTried;
std::map<int, int> mapNew; std::map<int, int> mapNew;
if (vRandom.size() != nTried + nNew) if (vRandom.size() != (size_t)(nTried + nNew))
return -7; return -7;
for (std::map<int, CAddrInfo>::iterator it = mapInfo.begin(); it != mapInfo.end(); it++) { for (std::map<int, CAddrInfo>::iterator it = mapInfo.begin(); it != mapInfo.end(); it++) {
@ -408,7 +408,7 @@ int CAddrMan::Check_()
} }
if (mapAddr[info] != n) if (mapAddr[info] != n)
return -5; return -5;
if (info.nRandomPos < 0 || info.nRandomPos >= vRandom.size() || vRandom[info.nRandomPos] != n) if (info.nRandomPos < 0 || (size_t)info.nRandomPos >= vRandom.size() || vRandom[info.nRandomPos] != n)
return -14; return -14;
if (info.nLastTry < 0) if (info.nLastTry < 0)
return -6; return -6;
@ -416,9 +416,9 @@ int CAddrMan::Check_()
return -8; return -8;
} }
if (setTried.size() != nTried) if (setTried.size() != (size_t)nTried)
return -9; return -9;
if (mapNew.size() != nNew) if (mapNew.size() != (size_t)nNew)
return -10; return -10;
for (int n = 0; n < ADDRMAN_TRIED_BUCKET_COUNT; n++) { for (int n = 0; n < ADDRMAN_TRIED_BUCKET_COUNT; n++) {