[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6464-g19ca83f

[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  19ca83f164917201def7ca93a4272a710955d383 (commit)
       via  c169fac97398dd2f68bb478ada390f37da8a8f19 (commit)
      from  b252521f50a2e1040490ff78111464a068a4e5d4 (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=19ca83f164917201def7ca93a4272a710955d383
commit 19ca83f164917201def7ca93a4272a710955d383
Merge: b252521 c169fac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Dec 30 15:30:21 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 30 15:30:21 2013 -0500

    Merge topic 'genex-numerics' into next
    
    c169fac Fix build.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c169fac97398dd2f68bb478ada390f37da8a8f19
commit c169fac97398dd2f68bb478ada390f37da8a8f19
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Dec 30 21:29:57 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Dec 30 21:29:57 2013 +0100

    Fix build.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 619037d..b55d0fb 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4237,7 +4237,7 @@ std::pair<bool, const char*> consistentNumberProperty(const char *lhs,
   long lnum = strtol(lhs, &pEnd, 0);
   if (pEnd == lhs || *pEnd != '\0' || errno == ERANGE)
     {
-    return 0;
+    return std::pair<bool, const char*>(false, 0);
     }
 
   long rnum = strtol(rhs, &pEnd, 0);

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

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


hooks/post-receive
-- 
CMake