[Cmake-commits] CMake branch, next, updated. v3.1.2-1213-g4367669

[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  4367669ad48ddd7dafabeb8b89e1a4c01189d376 (commit)
       via  95f070b6213379f13e37f23af4833e76703a2399 (commit)
      from  6c298034a8dabeea546317e152c7167924839c39 (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=4367669ad48ddd7dafabeb8b89e1a4c01189d376
commit 4367669ad48ddd7dafabeb8b89e1a4c01189d376
Merge: 6c29803 95f070b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:27:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:27:29 2015 -0500

    Merge topic 'use-cmRange' into next
    
    95f070b6 cmAlgorithms: Use signed pointer-size type for advance/retreat


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95f070b6213379f13e37f23af4833e76703a2399
commit 95f070b6213379f13e37f23af4833e76703a2399
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:26:35 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 09:26:35 2015 -0500

    cmAlgorithms: Use signed pointer-size type for advance/retreat
    
    The template approach caused the unsigned "-" in retreat to be treated
    as a very large advancement.

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

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

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


hooks/post-receive
-- 
CMake