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

nxcomp: fix shadow warning
d5c3e75b · Ulrich Sibiller · Mike Gabriel · 29bb1231 · d5c3e75b
Commit d5c3e75b authored Dec 10, 2017 by Ulrich Sibiller Committed by Mike Gabriel Dec 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Loop.cpp nxcomp/src/Loop.cpp +2 -2

No files found.
--- 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 -