[Cmake-commits] CMake branch, next, updated. v3.2.2-2105-g9d0836b

[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  9d0836bccda9fe477790dd94d4180884e144dd74 (commit)
       via  7238391e909792d1a86143ba0bdcaf385d492d4b (commit)
      from  3fdd9250b9656a62aaf989eced0e6c6f8bc01e5f (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=9d0836bccda9fe477790dd94d4180884e144dd74
commit 9d0836bccda9fe477790dd94d4180884e144dd74
Merge: 3fdd925 7238391
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 26 11:36:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 26 11:36:28 2015 -0400

    Merge topic 'refactor-cmDefinitions' into next
    
    7238391e MSVC fix.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7238391e909792d1a86143ba0bdcaf385d492d4b
commit 7238391e909792d1a86143ba0bdcaf385d492d4b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 26 17:36:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 26 17:36:00 2015 +0200

    MSVC fix.

diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 6f1bd02..e048750 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -17,7 +17,7 @@
 std::pair<const char*, bool> cmDefinitions::Get(const std::string& key)
 {
   MapType::const_iterator i = this->Map.find(key);
-  std::pair<const char*, bool> result(0, false);
+  std::pair<const char*, bool> result((const char*)0, false);
   if(i != this->Map.end())
     {
     result = std::make_pair(i->second.Exists ? i->second.c_str() : 0, true);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6482dc1..a124105 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -78,7 +78,7 @@ public:
       {
       defPtrs.push_back(&*it);
       }
-    std::pair<const char*, bool> result(0, false);
+    std::pair<const char*, bool> result((const char*)0, false);
     std::vector<cmDefinitions*>::const_reverse_iterator it = defPtrs.rbegin();
     for ( ; it != defPtrs.rend(); ++it)
       {

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

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


hooks/post-receive
-- 
CMake