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

Replace min() call with its literal definition

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

3
Source/CTest/cmCTestRunTest.cxx
View File

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