From 0d48f81d3214ed2e769265e649f6a799fc6693e2 Mon Sep 17 00:00:00 2001
From: Zach Mullen <zach.mullen@kitware.com>
Date: Wed, 17 Mar 2010 12:12:04 -0400
Subject: Test using std::min

---
 Source/CTest/cmCTestRunTest.cxx | 4 ++--
 1 file 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);
 }
 
 //----------------------------------------------------------------------
-- 
cgit v0.12