[Cmake-commits] CMake branch, master, updated. 4c59570bfbde9503fa5df747d431524f941e3e01

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  4c59570bfbde9503fa5df747d431524f941e3e01 (commit)
      from  beda5eab398ad117e2fe17cbbca1e65843abc74d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c59570bfbde9503fa5df747d431524f941e3e01
commit 4c59570bfbde9503fa5df747d431524f941e3e01
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Wed Mar 17 12:07:03 2010 -0400

    Replace min() call with its literal definition

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);
 }
 
 //----------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake