diff options
| author |  Sadie Powell | 2022-08-16 00:01:29 +0100 |
|---|---|---|
| committer | Sadie Powell | 2022-08-16 00:15:00 +0100 |
| commit | 017c9e608b76f61d95852ed7463c0c9003ae9a0f (patch) | |
| tree | 2d712b11ea5b1271f1c73c5efb22d46b35bf8f25 /include | |
| parent | Deprecate the string variant of SetClientIP. (diff) | |
Backport fix for types removed in C++17 from master.
Diffstat (limited to 'include')
| -rw-r--r-- | include/flat_map.h | 2 | ||||
| -rw-r--r-- | include/intrusive_list_impl.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/flat_map.h b/include/flat_map.h index c19cc9a09..80058b2f0 100644 --- a/include/flat_map.h +++ b/include/flat_map.h @@ -52,7 +52,7 @@ class map_pair_compare : public Comp }; template <typename Val, typename Comp> -class map_value_compare : public std::binary_function<Val, Val, bool> +class map_value_compare { public: // Constructor should be private diff --git a/include/intrusive_list_impl.h b/include/intrusive_list_impl.h index 7d71e3f78..a4902577b 100644 --- a/include/intrusive_list_impl.h +++ b/include/intrusive_list_impl.h @@ -24,11 +24,17 @@ template <typename T, typename Tag> class INSPIRCD_INTRUSIVE_LIST_NAME { public: - class iterator : public std::iterator<std::bidirectional_iterator_tag, T*> + class iterator { T* curr; public: + typedef std::ptrdiff_t difference_type; + typedef std::bidirectional_iterator_tag iterator_category; + typedef T** pointer; + typedef T*& reference; + typedef T* value_type; + iterator(T* i = NULL) : curr(i) { |