Skip to content
Snippets Groups Projects
Commit 4aee0036 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'hashtable-no-unary_function'


09724ac8 hashtable: Avoid use of std::unary_function

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !75
parents 9376537e 09724ac8
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,7 @@ namespace @KWSYS_NAMESPACE@ { ...@@ -49,7 +49,7 @@ namespace @KWSYS_NAMESPACE@ {
// select1st is an extension: it is not part of the standard. // select1st is an extension: it is not part of the standard.
template <class T1, class T2> 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 const T1& operator()(const std::pair<T1, T2>& __x) const
{ {
......
...@@ -49,7 +49,7 @@ namespace @KWSYS_NAMESPACE@ { ...@@ -49,7 +49,7 @@ namespace @KWSYS_NAMESPACE@ {
// identity is an extension: it is not part of the standard. // identity is an extension: it is not part of the standard.
template <class _Tp> template <class _Tp>
struct _Identity : public std::unary_function<_Tp, _Tp> struct _Identity
{ {
const _Tp& operator()(const _Tp& __x) const { return __x; } const _Tp& operator()(const _Tp& __x) const { return __x; }
}; };
......
...@@ -35,13 +35,12 @@ ...@@ -35,13 +35,12 @@
#include <@KWSYS_NAMESPACE@/Configure.hxx> #include <@KWSYS_NAMESPACE@/Configure.hxx>
#include <algorithm> // lower_bound #include <algorithm> // lower_bound
#include <functional> // unary_function #include <iterator> // iterator_traits
#include <iterator> // iterator_traits #include <memory> // allocator
#include <memory> // allocator #include <stddef.h> // size_t
#include <stddef.h> // size_t #include <utility> // pair
#include <utility> // pair #include <vector> // vector
#include <vector> // vector
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment