[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6481-g8a33437

[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  8a33437e6b99f6ad6ebdc35758cfa3cd7538c862 (commit)
       via  fb449593320e49c45c37419f23e2245dc3918855 (commit)
      from  321779bb6bc58a7ffed71fdabe5f37cdd555bddb (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=8a33437e6b99f6ad6ebdc35758cfa3cd7538c862
commit 8a33437e6b99f6ad6ebdc35758cfa3cd7538c862
Merge: 321779b fb44959
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Dec 30 17:07:59 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 30 17:07:59 2013 -0500

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


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

    MSVC pair can't convert 0 to a nullptr.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b124594..2b82442 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4284,11 +4284,18 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
     {
     return std::make_pair(true, lhs);
     }
+
+#if defined(_MSC_VER)
+  static const char* const null_ptr = 0;
+#else
+# define null_ptr 0
+#endif
+
   switch(t)
   {
   case BoolType:
     assert(!"consistentProperty for strings called with BoolType");
-    return std::pair<bool, const char*>(false, 0);
+    return std::pair<bool, const char*>(false, null_ptr);
   case StringType:
     return consistentStringProperty(lhs, rhs);
   case NumberMinType:
@@ -4296,7 +4303,12 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
     return consistentNumberProperty(lhs, rhs, t);
   }
   assert(!"Unreachable!");
-  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
+
 }
 
 template<typename PropertyType>

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

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


hooks/post-receive
-- 
CMake