[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6479-g321779b

[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  321779bb6bc58a7ffed71fdabe5f37cdd555bddb (commit)
       via  c0eb997fd25400271642d6e6f3200872147326df (commit)
      from  c1dcb1959714cf1018506f1dd3417e764cd1c132 (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=321779bb6bc58a7ffed71fdabe5f37cdd555bddb
commit 321779bb6bc58a7ffed71fdabe5f37cdd555bddb
Merge: c1dcb19 c0eb997
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Dec 30 17:00:53 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 30 17:00:53 2013 -0500

    Merge topic 'minor-cleanups' into next
    
    c0eb997 MSVC pair can't convert 0 to a nullptr.


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

    MSVC pair can't convert 0 to a nullptr.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index cfc2d3e..b124594 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4234,18 +4234,28 @@ std::pair<bool, const char*> consistentNumberProperty(const char *lhs,
 {
   char *pEnd;
 
+#if defined(_MSC_VER)
+  static const char* const null_ptr = 0;
+#else
+# define null_ptr 0
+#endif
+
   long lnum = strtol(lhs, &pEnd, 0);
   if (pEnd == lhs || *pEnd != '\0' || errno == ERANGE)
     {
-    return std::pair<bool, const char*>(false, 0);
+    return std::pair<bool, const char*>(false, null_ptr);
     }
 
   long rnum = strtol(rhs, &pEnd, 0);
   if (pEnd == rhs || *pEnd != '\0' || errno == ERANGE)
     {
-    return std::pair<bool, const char*>(false, 0);
+    return std::pair<bool, const char*>(false, null_ptr);
     }
 
+#if !defined(_MSC_VER)
+#undef null_ptr
+#endif
+
   if (t == NumberMaxType)
     {
     return std::make_pair(true, cmMaximum(lnum, rnum) == lnum ? lhs : rhs);

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

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


hooks/post-receive
-- 
CMake