diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2010-03-17 16:12:04 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2010-03-17 16:12:04 (GMT) |
| commit | 0d48f81d3214ed2e769265e649f6a799fc6693e2 (patch) | |
| tree | 7ca5208f2761eaf88c6129e6679279d8259f7b9b | |
| parent | 4c59570bfbde9503fa5df747d431524f941e3e01 (diff) | |
| download | CMake-0d48f81d3214ed2e769265e649f6a799fc6693e2.zip CMake-0d48f81d3214ed2e769265e649f6a799fc6693e2.tar.gz CMake-0d48f81d3214ed2e769265e649f6a799fc6693e2.tar.bz2 | |
Test using std::min
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 72f3d40..549de81 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -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); } //---------------------------------------------------------------------- |