[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1071-gacbb292

[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  acbb29284941bd549fa9fd713dac9e50ceb6e58c (commit)
       via  82d7acb3cf014a9760341363a8e652e7a1440d21 (commit)
      from  a9d6a0926705062ac183f8fab1cfa14b900a70b4 (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=acbb29284941bd549fa9fd713dac9e50ceb6e58c
commit acbb29284941bd549fa9fd713dac9e50ceb6e58c
Merge: a9d6a09 82d7acb
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Dec 3 11:06:40 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 3 11:06:40 2014 -0500

    Merge topic 'cached-regex-clear-fixed' into next
    
    82d7acb3 fixup! cmMakefile: store the number of last matches in a CMake var


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82d7acb3cf014a9760341363a8e652e7a1440d21
commit 82d7acb3cf014a9760341363a8e652e7a1440d21
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Dec 3 11:06:25 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Dec 3 11:06:25 2014 -0500

    fixup! cmMakefile: store the number of last matches in a CMake var

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 24e65d7..a7acc27 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4891,7 +4891,7 @@ void cmMakefile::StoreMatches(cmsys::RegularExpression& re)
       std::string const& var = matchVariables[i];
       this->AddDefinition(var, m.c_str());
       this->MarkVariableAsUsed(var);
-      highest = '0' + i;
+      highest = static_cast<char>('0' + i);
       }
     }
   char nMatches[] = {highest, '\0'};

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

Summary of changes:
 Source/cmMakefile.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake