[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2525-g25d6f1b

[Stephen Kelly]

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, next has been updated
       via  25d6f1b6f4ea563b97f0663705ecbad15e5b2a8d (commit)
       via  908b864570ed87bb4e36fce24e9d5c03c3379a42 (commit)
      from  c47d23927e5b22d19a555795c46d51d4e3ad0851 (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=25d6f1b6f4ea563b97f0663705ecbad15e5b2a8d
commit 25d6f1b6f4ea563b97f0663705ecbad15e5b2a8d
Merge: c47d239 908b864
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 14 17:14:44 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 14 17:14:44 2013 -0400

    Merge topic 'fix-genex-preprocess' into next
    
    908b864 Don't use std::min.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=908b864570ed87bb4e36fce24e9d5c03c3379a42
commit 908b864570ed87bb4e36fce24e9d5c03c3379a42
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 14 22:13:27 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 14 22:13:27 2013 +0100

    Don't use std::min.
    
    There is no existing use in cmake, so I suspect it wouldn't pass
    the dashboard.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 3a9a4ce..ab8bd13 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -256,7 +256,7 @@ static std::string stripExportInterface(const std::string &input,
       }
     else
       {
-      pos = std::min(bPos, iPos);
+      pos = (bPos < iPos) ? bPos : iPos;
       }
 
     result += input.substr(lastPos, pos - lastPos);

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

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


hooks/post-receive
-- 
CMake