[Cmake-commits] CMake branch, master, updated. 0d48f81d3214ed2e769265e649f6a799fc6693e2

[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  0d48f81d3214ed2e769265e649f6a799fc6693e2 (commit)
      from  4c59570bfbde9503fa5df747d431524f941e3e01 (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=0d48f81d3214ed2e769265e649f6a799fc6693e2
commit 0d48f81d3214ed2e769265e649f6a799fc6693e2
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Wed Mar 17 12:12:04 2010 -0400

    Test using std::min

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

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

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


hooks/post-receive
-- 
CMake