[Cmake-commits] CMake branch, next, updated. v3.1.2-1211-g6c29803

[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  6c298034a8dabeea546317e152c7167924839c39 (commit)
       via  348155f1314d2538353b6936f76dc0466bd60f35 (commit)
       via  df38fac03da0d9c05d3c613f40f1421088ba8b66 (commit)
      from  db0f1df7bada28ea675fb563803786e7251c42b9 (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=6c298034a8dabeea546317e152c7167924839c39
commit 6c298034a8dabeea546317e152c7167924839c39
Merge: db0f1df 348155f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 03:41:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 03:41:47 2015 -0500

    Merge topic 'use-cmRange' into next
    
    348155f1 Resolve warning.
    df38fac0 Remove unused variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=348155f1314d2538353b6936f76dc0466bd60f35
commit 348155f1314d2538353b6936f76dc0466bd60f35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 09:41:15 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 09:41:15 2015 +0100

    Resolve warning.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 851b105..430e25e 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -122,13 +122,15 @@ struct Range
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
-  Range& advance(size_t amount)
+  template<typename Distance>
+  Range& advance(Distance amount)
   {
     std::advance(Begin, amount);
     return *this;
   }
 
-  Range& retreat(size_t amount)
+  template<typename Distance>
+  Range& retreat(Distance amount)
   {
     std::advance(End, -amount);
     return *this;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df38fac03da0d9c05d3c613f40f1421088ba8b66
commit df38fac03da0d9c05d3c613f40f1421088ba8b66
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 09:30:49 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 09:30:49 2015 +0100

    Remove unused variable.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index ecdd4a0..e09a934 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -254,7 +254,6 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     if (!this->Depth)
       {
       std::string name = this->Args[0];
-      std::vector<std::string>::size_type cc;
       name += "(";
       if (!this->Args.empty())
         {

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

Summary of changes:
 Source/cmAlgorithms.h     |    6 ++++--
 Source/cmMacroCommand.cxx |    1 -
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake