From ac1eba1d2cd22e62b24b963028f2cd623b1ab1da Mon Sep 17 00:00:00 2001 From: Sam Varshavchik Date: Sun, 22 May 2022 13:35:13 -0400 Subject: gcc 12 and autotools updates. --- unicode/courier-unicode.h.in | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'unicode/courier-unicode.h.in') diff --git a/unicode/courier-unicode.h.in b/unicode/courier-unicode.h.in index 6a6882e..95add35 100644 --- a/unicode/courier-unicode.h.in +++ b/unicode/courier-unicode.h.in @@ -1861,9 +1861,15 @@ private: ** an input iterator sequence over linebreak values. */ -template class linebreak_iter - : public std::iterator -{ +template class linebreak_iter { + +public: + typedef std::input_iterator_tag iterator_category; + typedef int value_type; + typedef void difference_type; + typedef value_type * pointer; + typedef value_type & reference; +private: mutable input_t iter_value, end_iter_value; mutable linebreak_callback_save_buf *buf; @@ -2054,10 +2060,16 @@ private: ** the character. */ -template class linebreakc_iter - : public std::iterator, void> -{ +template class linebreakc_iter { + +public: + typedef std::input_iterator_tag iterator_category; + typedef std::pair value_type; + typedef void difference_type; + typedef value_type * pointer; + typedef value_type & reference; +private: + mutable input_t iter_value, end_iter_value; mutable linebreakc_callback_save_buf *buf; -- cgit v1.2.3