kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test using std::min

Browse Source
This commit is contained in:
Zach Mullen 2010-03-17 12:12:04 -04:00
parent 4c59570bfb
commit 0d48f81d32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CTest/cmCTestRunTest.cxx
View File

@ -564,8 +564,8 @@ double cmCTestRunTest::ResolveTimeout()
"Exiting ctest." << std::endl); "Exiting ctest." << std::endl);
exit(-1); exit(-1);
} }
return timeout == 0 ? stop_timeout : #undef min
(timeout < stop_timeout ? timeout : stop_timeout); return timeout == 0 ? stop_timeout : std::min(timeout, stop_timeout);
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------