diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2017-12-07 12:08:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-07 12:25:03 (GMT) |
| commit | 5b1c84b449cbe84e429c968dd450673203493d5b (patch) | |
| tree | 36034858e9ce155b923b971d912ace60303b94b4 | |
| parent | 52a5c4a877d066a283e76bd5b6e63a9f3eec31ea (diff) | |
| download | CMake-5b1c84b449cbe84e429c968dd450673203493d5b.zip CMake-5b1c84b449cbe84e429c968dd450673203493d5b.tar.gz CMake-5b1c84b449cbe84e429c968dd450673203493d5b.tar.bz2 | |
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
| -rw-r--r-- | hash_map.hxx.in | 2 | ||||
| -rw-r--r-- | hash_set.hxx.in | 2 | ||||
| -rw-r--r-- | 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 <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) |