//! iterator requires Offset and Differ methods. See NCollection_Vector as
//! example of declaring custom STL iterators.
template<class Category, class BaseIterator, class ItemType, bool IsConstant>
-class NCollection_StlIterator :
- public std::iterator<Category, ItemType, ptrdiff_t,
- typename std::conditional<IsConstant, const ItemType*, ItemType*>::type,
- typename std::conditional<IsConstant, const ItemType&, ItemType&>::type>
+class NCollection_StlIterator
{
public:
+ // Since C++20 inheritance from std::iterator is deprecated, so define predefined types manually:
+ using iterator_category = Category;
+ using value_type = ItemType;
+ using difference_type = ptrdiff_t;
+ using pointer = typename std::conditional<IsConstant, const ItemType*, ItemType*>::type;
+ using reference = typename std::conditional<IsConstant, const ItemType&, ItemType&>::type;
+
//! Default constructor
NCollection_StlIterator () {}
//! iteration over objects subject to parallel processing.
//! It stores pointer to instance of polymorphic iterator inheriting from
//! IteratorInterface, which contains actual type-specific iterator.
- class UniversalIterator :
+ class UniversalIterator
// Note that TBB requires that value_type of iterator be copyable,
// thus we use its own type for that
- public std::iterator<std::forward_iterator_tag, UniversalIterator, ptrdiff_t, UniversalIterator*, UniversalIterator&>
{
public:
+
+ // Since C++20 inheritance from std::iterator is deprecated, so define predefined types manually:
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = UniversalIterator;
+ using difference_type = ptrdiff_t;
+ using pointer = UniversalIterator*;
+ using reference = UniversalIterator&;
+
UniversalIterator() {}
UniversalIterator(IteratorInterface* theOther)
projects / occt.git / commitdiff