reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-14 07:09:22 +00:00
Code Issues Actions Packages Projects 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);
exit(-1);
}
return timeout == 0 ? stop_timeout :
(timeout < stop_timeout ? timeout : stop_timeout);
#undef min
return timeout == 0 ? stop_timeout : std::min(timeout, stop_timeout);
}
//----------------------------------------------------------------------