diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-08 14:12:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-08 14:12:54 (GMT) |
| commit | bbac777698bf30be07a0edcc34ddc1a1e16b2dc5 (patch) | |
| tree | 3887710ab3631658da61e55cb6d7490d96d80d01 /Source | |
| parent | 1c40558e9179779a097b9b5937a48c5da0000561 (diff) | |
| parent | c50f08cdd88171fefda154623bba3aa21a2ceac2 (diff) | |
| download | CMake-bbac777698bf30be07a0edcc34ddc1a1e16b2dc5.zip CMake-bbac777698bf30be07a0edcc34ddc1a1e16b2dc5.tar.gz CMake-bbac777698bf30be07a0edcc34ddc1a1e16b2dc5.tar.bz2 | |
Merge topic 'update-kwsys'
c50f08cd Merge branch 'upstream-KWSys' into update-kwsys
5b1c84b4 KWSys 2017-12-07 (4aee0036)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1567
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/hash_map.hxx.in | 2 | ||||
| -rw-r--r-- | Source/kwsys/hash_set.hxx.in | 2 | ||||
| -rw-r--r-- | Source/kwsys/hashtable.hxx.in | 13 |
3 files changed, 8 insertions, 9 deletions
diff --git a/Source/kwsys/hash_map.hxx.in b/Source/kwsys/hash_map.hxx.in index 3f9174f..8c9b81e 100644 --- a/Source/kwsys/hash_map.hxx.in +++ b/Source/kwsys/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/Source/kwsys/hash_set.hxx.in b/Source/kwsys/hash_set.hxx.in index e3a0c6c..5edd367 100644 --- a/Source/kwsys/hash_set.hxx.in +++ b/Source/kwsys/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/Source/kwsys/hashtable.hxx.in b/Source/kwsys/hashtable.hxx.in index dd92cb9..e962f17 100644 --- a/Source/kwsys/hashtable.hxx.in +++ b/Source/kwsys/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) |