diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-12-10 16:23:03 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-11 09:48:14 +0100 |
| commit | d5c3e75b3b4d451b33daa0f7c07c3e7a16a88d7c (patch) | |
| tree | 37b25717348942a492b1d81fe2a8db0ec9ebcdc2 /nxcomp | |
| parent | 29bb123124ae92c10baf49204da36184e05ae232 (diff) | |
| download | nx-libs-d5c3e75b3b4d451b33daa0f7c07c3e7a16a88d7c.tar.gz nx-libs-d5c3e75b3b4d451b33daa0f7c07c3e7a16a88d7c.tar.bz2 nx-libs-d5c3e75b3b4d451b33daa0f7c07c3e7a16a88d7c.zip | |
nxcomp: fix shadow warning
Fixes this:
CXX Loop.lo
Loop.cpp: In function 'void handleCheckResultInLoop(int&, int&, int&, fd_set&, fd_set&, timeval&, timeval&)':
Loop.cpp:14080:68: warning: declaration of 'startTs' shadows a global declaration [-Wshadow]
struct timeval &startTs)
^
Loop.cpp:1020:13: note: shadowed declaration is here
T_timestamp startTs;
Fixes ArcticaProject/nx-libs#545
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/src/Loop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index baad17699..bb6d18531 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -14079,9 +14079,9 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet, static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet, fd_set &writeSet, struct timeval &selectTs, - struct timeval &startTs) + struct timeval &pstartTs) { - int diffTs = diffTimestamp(startTs, getNewTimestamp()); + int diffTs = diffTimestamp(pstartTs, getNewTimestamp()); if (diffTs >= (control -> PingTimeout - |