[Cmake-commits] CMake branch, master, updated. v3.10.0-573-gbbac777

[Kitware Robot]

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, master has been updated
       via  bbac777698bf30be07a0edcc34ddc1a1e16b2dc5 (commit)
       via  c50f08cdd88171fefda154623bba3aa21a2ceac2 (commit)
       via  5b1c84b449cbe84e429c968dd450673203493d5b (commit)
      from  1c40558e9179779a097b9b5937a48c5da0000561 (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=bbac777698bf30be07a0edcc34ddc1a1e16b2dc5
commit bbac777698bf30be07a0edcc34ddc1a1e16b2dc5
Merge: 1c40558 c50f08c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 8 14:12:49 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Dec 8 09:12:54 2017 -0500

    Merge topic 'update-kwsys'
    
    c50f08cd Merge branch 'upstream-KWSys' into update-kwsys
    5b1c84b4 KWSys 2017-12-07 (4aee0036)
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1567


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50f08cdd88171fefda154623bba3aa21a2ceac2
commit c50f08cdd88171fefda154623bba3aa21a2ceac2
Merge: f5e48ed 5b1c84b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 7 07:25:03 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 7 07:25:03 2017 -0500

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2017-12-07 (4aee0036)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b1c84b449cbe84e429c968dd450673203493d5b
commit 5b1c84b449cbe84e429c968dd450673203493d5b
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Thu Dec 7 07:08:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 7 07:25:03 2017 -0500

    KWSys 2017-12-07 (4aee0036)
    
    Code extracted from:
    
        https://gitlab.kitware.com/utils/kwsys.git
    
    at commit 4aee00361a2a38b99911318db84551eed8d3fcfc (master).
    
    Upstream Shortlog
    -----------------
    
    Brad King (1):
          09724ac8 hashtable: Avoid use of std::unary_function

diff --git a/hash_map.hxx.in b/hash_map.hxx.in
index 3f9174f..8c9b81e 100644
--- a/hash_map.hxx.in
+++ b/hash_map.hxx.in
@@ -49,7 +49,7 @@ namespace @KWSYS_NAMESPACE@ {
 
 // select1st is an extension: it is not part of the standard.
 template <class T1, class T2>
-struct hash_select1st : public std::unary_function<std::pair<T1, T2>, T1>
+struct hash_select1st
 {
   const T1& operator()(const std::pair<T1, T2>& __x) const
   {
diff --git a/hash_set.hxx.in b/hash_set.hxx.in
index e3a0c6c..5edd367 100644
--- a/hash_set.hxx.in
+++ b/hash_set.hxx.in
@@ -49,7 +49,7 @@ namespace @KWSYS_NAMESPACE@ {
 
 // identity is an extension: it is not part of the standard.
 template <class _Tp>
-struct _Identity : public std::unary_function<_Tp, _Tp>
+struct _Identity
 {
   const _Tp& operator()(const _Tp& __x) const { return __x; }
 };
diff --git a/hashtable.hxx.in b/hashtable.hxx.in
index dd92cb9..e962f17 100644
--- a/hashtable.hxx.in
+++ b/hashtable.hxx.in
@@ -35,13 +35,12 @@
 
 #include <@KWSYS_NAMESPACE@/Configure.hxx>
 
-#include <algorithm>  // lower_bound
-#include <functional> // unary_function
-#include <iterator>   // iterator_traits
-#include <memory>     // allocator
-#include <stddef.h>   // size_t
-#include <utility>    // pair
-#include <vector>     // vector
+#include <algorithm> // lower_bound
+#include <iterator>  // iterator_traits
+#include <memory>    // allocator
+#include <stddef.h>  // size_t
+#include <utility>   // pair
+#include <vector>    // vector
 
 #if defined(_MSC_VER)
 #pragma warning(push)

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

Summary of changes:
 Source/kwsys/hash_map.hxx.in  |    2 +-
 Source/kwsys/hash_set.hxx.in  |    2 +-
 Source/kwsys/hashtable.hxx.in |   13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake