diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2010-03-17 16:07:03 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2010-03-17 16:07:10 (GMT) |
| commit | 4c59570bfbde9503fa5df747d431524f941e3e01 (patch) | |
| tree | 003b519a2fab355b0c00a377e59d3a7f2bda910d /Source/CTest | |
| parent | beda5eab398ad117e2fe17cbbca1e65843abc74d (diff) | |
| download | CMake-4c59570bfbde9503fa5df747d431524f941e3e01.zip CMake-4c59570bfbde9503fa5df747d431524f941e3e01.tar.gz CMake-4c59570bfbde9503fa5df747d431524f941e3e01.tar.bz2 | |
Replace min() call with its literal definition
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 94ccffe..72f3d40 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -564,7 +564,8 @@ double cmCTestRunTest::ResolveTimeout() "Exiting ctest." << std::endl); exit(-1); } - return timeout == 0 ? stop_timeout : min(timeout, stop_timeout); + return timeout == 0 ? stop_timeout : + (timeout < stop_timeout ? timeout : stop_timeout); } //---------------------------------------------------------------------- |