From 84f5ff06f0c7dbe10f5ec8452521bd79262bc05b Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 21 Mar 2022 06:02:47 +0100 Subject: Avoid use of deprecated std::iterator (twice) Closes: #1008036 --- apt-pkg/cacheiterators.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'apt-pkg/cacheiterators.h') diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 466492442..9273369bd 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -44,8 +44,7 @@ // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we need to have for doing some walk-over-the-cache magic */ -template class APT_PUBLIC pkgCache::Iterator : - public std::iterator { +template class APT_PUBLIC pkgCache::Iterator { /** \brief Returns the Pointer for this struct in the owner * The implementation of this method should be pretty short * as it will only return the Pointer into the mmap stored @@ -61,6 +60,12 @@ template class APT_PUBLIC pkgCache::Iterator : pkgCache *Owner; public: + // iterator_traits + using iterator_category = std::forward_iterator_tag; + using value_type = Str; + using difference_type = std::ptrdiff_t; + using pointer = Str*; + using reference = Str&; // Iteration inline bool end() const {return Owner == 0 || S == OwnerPointer();} -- cgit v1.2.3-70-g09d2