[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-585-g4dac995

[Ben Boeckel]

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  4dac9953188a771eae2f23c0bda041cf1e1ab439 (commit)
       via  b138be07b4b2258a3c64245cdf13a4d7cc05b977 (commit)
       via  8d379cd7ac25481ef3b43da12aade24b1e47ccdf (commit)
      from  0639b23221a02676e1162f74da0ca7b346b14904 (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=4dac9953188a771eae2f23c0bda041cf1e1ab439
commit 4dac9953188a771eae2f23c0bda041cf1e1ab439
Merge: 0639b23 b138be0
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Nov 13 13:33:07 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 13 13:33:07 2014 -0500

    Merge topic 'fix-vs2015-warnings' into next
    
    b138be07 cmVisualStudio10TargetGenerator: fix a narrowing warning
    8d379cd7 cmCallVisualStudioMacro: fix a shadowing warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b138be07b4b2258a3c64245cdf13a4d7cc05b977
commit b138be07b4b2258a3c64245cdf13a4d7cc05b977
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Nov 13 13:28:08 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Nov 13 13:28:08 2014 -0500

    cmVisualStudio10TargetGenerator: fix a narrowing warning
    
    0xAA literals are integers which doesn't fit into a char array. C++11
    says this is an error and VS2015 now warns about it.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 26fc317..17a36d4 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -307,7 +307,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->BuildFileStream->SetCopyIfDifferent(true);
 
   // Write the encoding header into the file
-  char magic[] = {0xEF,0xBB, 0xBF};
+  char magic[] = {char(0xEF), char(0xBB), char(0xBF)};
   this->BuildFileStream->write(magic, 3);
 
   //get the tools version to use
@@ -937,7 +937,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   path += ".vcxproj.filters";
   cmGeneratedFileStream fout(path.c_str());
   fout.SetCopyIfDifferent(true);
-  char magic[] = {0xEF,0xBB, 0xBF};
+  char magic[] = {char(0xEF), char(0xBB), char(0xBF)};
   fout.write(magic, 3);
   cmGeneratedFileStream* save = this->BuildFileStream;
   this->BuildFileStream = & fout;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d379cd7ac25481ef3b43da12aade24b1e47ccdf
commit 8d379cd7ac25481ef3b43da12aade24b1e47ccdf
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Nov 13 13:27:56 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Nov 13 13:27:56 2014 -0500

    cmCallVisualStudioMacro: fix a shadowing warning

diff --git a/Source/cmCallVisualStudioMacro.cxx b/Source/cmCallVisualStudioMacro.cxx
index 0c15477..8f22f80 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -63,12 +63,13 @@ static bool LogErrorsAsMessages;
     { \
     if (LogErrorsAsMessages) \
       { \
-      std::ostringstream oss; \
-      oss.flags(std::ios::hex); \
-      oss << context << " failed HRESULT, hr = 0x" << hr << std::endl; \
-      oss.flags(std::ios::dec); \
-      oss << __FILE__ << "(" << __LINE__ << ")"; \
-      cmSystemTools::Message(oss.str().c_str()); \
+      std::ostringstream _hresult_oss; \
+      _hresult_oss.flags(std::ios::hex); \
+      _hresult_oss << context << " failed HRESULT, hr = 0x" \
+                   << hr << std::endl; \
+      _hresult_oss.flags(std::ios::dec); \
+      _hresult_oss << __FILE__ << "(" << __LINE__ << ")"; \
+      cmSystemTools::Message(_hresult_oss.str().c_str()); \
       } \
     }
 

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

Summary of changes:
 Source/cmCallVisualStudioMacro.cxx         |   13 +++++++------
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake