[Cmake-commits] CMake branch, next, updated. v3.1.0-1491-g1ec61b9

[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  1ec61b9ae1e107567553ee4fd799a41fb266735a (commit)
       via  7aba88cc18f2d1b46a210e4132f04798feb5d93e (commit)
      from  dc834a64ff36cf9f7d8863bcb26862ca00c602e0 (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=1ec61b9ae1e107567553ee4fd799a41fb266735a
commit 1ec61b9ae1e107567553ee4fd799a41fb266735a
Merge: dc834a6 7aba88c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 4 11:02:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 4 11:02:53 2015 -0500

    Merge topic 'delete-algorithm' into next
    
    7aba88cc Simplify the template metaprogram.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7aba88cc18f2d1b46a210e4132f04798feb5d93e
commit 7aba88cc18f2d1b46a210e4132f04798feb5d93e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 4 17:01:05 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 4 17:01:39 2015 +0100

    Simplify the template metaprogram.
    
    No need to go through iterator_traits really.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index af060a3..4e846e6 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -463,11 +463,7 @@ struct HasSecondType<T, typename voider<typename T::second_type>::type>
 };
 
 template<typename Container,
-    bool hasSecondType = HasSecondType<
-        typename std::iterator_traits<
-            typename Container::const_iterator
-            >::value_type
-        >::value>
+    bool hasSecondType = HasSecondType<typename Container::value_type>::value>
 struct DefaultDeleter
 {
   void operator()(typename Container::value_type value) {

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

Summary of changes:
 Source/cmStandardIncludes.h |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)


hooks/post-receive
-- 
CMake