1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 14:11:29 +00:00

Scan iterator fix for compilation under Visual Studio 2010

This commit is contained in:
tudor
2016-10-18 15:56:40 +00:00
parent 18d7a9195d
commit 0a7a7e395b
3 changed files with 13 additions and 13 deletions

View File

@@ -491,7 +491,7 @@ bool do_one_select_round(UltraScanInfo *USI, struct timeval *stime) {
int timeleft;
ConnectScanInfo *CSI = USI->gstats->CSI;
int sd;
std::multiset<HostScanStats *>::iterator hostI;
std::multiset<HostScanStats *, HssPredicate>::iterator hostI;
HostScanStats *host;
UltraProbe *probe = NULL;
int optval;
@@ -532,7 +532,7 @@ bool do_one_select_round(UltraScanInfo *USI, struct timeval *stime) {
and find the relevant ones. Note the peculiar structure of the loop--we
iterate through both incompleteHosts and completedHosts, because global
timing pings are sent to hosts in completedHosts. */
std::multiset<HostScanStats *>::iterator incompleteHostI, completedHostI;
std::multiset<HostScanStats *, HssPredicate>::iterator incompleteHostI, completedHostI;
incompleteHostI = USI->incompleteHosts.begin();
completedHostI = USI->completedHosts.begin();
while ((incompleteHostI != USI->incompleteHosts.end()