From 8c856408f582dd36811d0f81b2cc431c3d3d8158 Mon Sep 17 00:00:00 2001 From: Desour Date: Mon, 12 Jun 2023 18:53:06 +0200 Subject: [PATCH] Remove use of std::iterator (Deprecated in C++17.) --- include/irrUString.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/include/irrUString.h b/include/irrUString.h index bd6953b4..9b6c2417 100644 --- a/include/irrUString.h +++ b/include/irrUString.h @@ -429,24 +429,19 @@ public: //! Iterator to iterate through a UTF-16 string. - class _ustring16_const_iterator : public std::iterator< - std::bidirectional_iterator_tag, // iterator_category - access, // value_type - ptrdiff_t, // difference_type - const access, // pointer - const access // reference - > + class _ustring16_const_iterator { public: typedef _ustring16_const_iterator _Iter; - typedef std::iterator _Base; typedef const access const_pointer; typedef const access const_reference; + typedef ptrdiff_t distance_type; - typedef typename _Base::value_type value_type; - typedef typename _Base::difference_type difference_type; - typedef typename _Base::difference_type distance_type; - typedef typename _Base::pointer pointer; + // stuff for std::iterator_traits + typedef std::bidirectional_iterator_tag iterator_category; + typedef access value_type; + typedef distance_type difference_type; + typedef const access pointer; typedef const_reference reference; //! Constructors.