From 4c59570bfbde9503fa5df747d431524f941e3e01 Mon Sep 17 00:00:00 2001 From: Zach Mullen Date: Wed, 17 Mar 2010 12:07:03 -0400 Subject: Replace min() call with its literal definition --- Source/CTest/cmCTestRunTest.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } //---------------------------------------------------------------------- -- cgit v0.12