[Cmake-commits] CMake branch, next, updated. v3.6.1-1179-g56bac0a

[Brad King]

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  56bac0ae7c1e982e995546e8458a0f73b0f477b5 (commit)
       via  c6da78dfa74d2dbab57535d864d2d1772763d008 (commit)
       via  83273ca5a1d36a6f05695d4c90a9e30c2874a087 (commit)
      from  c9477b66889974bf27c435ef951435a557bfd1b7 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56bac0ae7c1e982e995546e8458a0f73b0f477b5
commit 56bac0ae7c1e982e995546e8458a0f73b0f477b5
Merge: c9477b6 c6da78d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 9 09:15:49 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 9 09:15:49 2016 -0400

    Merge topic 'autogen-same-name' into next
    
    c6da78df fixup! cmFilePathUuid: Add class to generate deterministic unique file names
    83273ca5 QtAutogen: Replace invalid character for symbol names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6da78dfa74d2dbab57535d864d2d1772763d008
commit c6da78dfa74d2dbab57535d864d2d1772763d008
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 9 09:14:18 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 9 09:14:18 2016 -0400

    fixup! cmFilePathUuid: Add class to generate deterministic unique file names

diff --git a/Source/cmFilePathUuid.cxx b/Source/cmFilePathUuid.cxx
index e226cdc..592c3a6 100644
--- a/Source/cmFilePathUuid.cxx
+++ b/Source/cmFilePathUuid.cxx
@@ -126,18 +126,18 @@ std::string cmFilePathUuid::GetChecksumString(
       for (unsigned int jj = 0; jj != 2; ++jj) {
         const unsigned char nibble = hexHash[ii * 2 + jj];
         if ('0' <= nibble && nibble <= '9') {
-          hbyte[jj] = nibble - '0';
+          hbyte[jj] = static_cast<unsigned char>(nibble - '0');
         } else if ('a' <= nibble && nibble <= 'f') {
-          hbyte[jj] = nibble - 'a' + 10;
+          hbyte[jj] = static_cast<unsigned char>(nibble - 'a' + 10);
         } else if ('A' <= nibble && nibble <= 'f') {
-          hbyte[jj] = nibble - 'A' + 10;
+          hbyte[jj] = static_cast<unsigned char>(nibble - 'A' + 10);
         } else {
           // Unexpected non hex character
           std::cerr << "Unexpected non hex character in checksum string";
           exit(-1);
         }
       }
-      hashBytes[ii] = hbyte[1] | (hbyte[0] << 4);
+      hashBytes[ii] = static_cast<unsigned char>(hbyte[1] | (hbyte[0] << 4));
     }
   }
   // Convert hash bytes to Base64 text string

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83273ca5a1d36a6f05695d4c90a9e30c2874a087
commit 83273ca5a1d36a6f05695d4c90a9e30c2874a087
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Aug 8 20:58:21 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 9 09:04:40 2016 -0400

    QtAutogen: Replace invalid character for symbol names

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 6a95615..a261962 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1331,6 +1331,10 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
     // Remove "qrc_" at string begin
     symbolName.erase(0, 4);
   }
+  // Replace '-' with '_'. The former is valid for
+  // file names but not for symbol names.
+  std::replace(symbolName.begin(), symbolName.end(), '-', '_');
+
   const std::string qrcBuildFile = this->Builddir + qrcOutputFile;
 
   int sourceNewerThanQrc = 0;

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

Summary of changes:
 Source/cmFilePathUuid.cxx     |    8 ++++----
 Source/cmQtAutoGenerators.cxx |    4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake