diff options
Diffstat (limited to 'Source')
| -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); } //---------------------------------------------------------------------- |