From 5b1c84b449cbe84e429c968dd450673203493d5b Mon Sep 17 00:00:00 2001 From: KWSys Upstream Date: Thu, 7 Dec 2017 07:08:22 -0500 Subject: 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 --- hash_map.hxx.in | 2 +- hash_set.hxx.in | 2 +- hashtable.hxx.in | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) 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 -struct hash_select1st : public std::unary_function, T1> +struct hash_select1st { const T1& operator()(const std::pair& __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 -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 // lower_bound -#include // unary_function -#include // iterator_traits -#include // allocator -#include // size_t -#include // pair -#include // vector +#include // lower_bound +#include // iterator_traits +#include // allocator +#include // size_t +#include // pair +#include // vector #if defined(_MSC_VER) #pragma warning(push) -- cgit v0.12