Browse Source

Test using std::min

Zach Mullen 16 years ago
parent
commit
0d48f81d32
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Source/CTest/cmCTestRunTest.cxx

+ 2 - 2
Source/CTest/cmCTestRunTest.cxx

@@ -564,8 +564,8 @@ double cmCTestRunTest::ResolveTimeout()
       "Exiting ctest." << std::endl);
       "Exiting ctest." << std::endl);
     exit(-1);
     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);
 }
 }
 
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------