diff --git a/cisstVector/vctFixedStrideMatrixIterator.h b/cisstVector/vctFixedStrideMatrixIterator.h index 6f76d9838..8710e0257 100644 --- a/cisstVector/vctFixedStrideMatrixIterator.h +++ b/cisstVector/vctFixedStrideMatrixIterator.h @@ -6,8 +6,7 @@ Author(s): Ofri Sadowsky, Anton Deguet Created on: 2003-09-30 - (C) Copyright 2003-2013 Johns Hopkins University (JHU), All Rights - Reserved. + (C) Copyright 2003-2025 Johns Hopkins University (JHU), All Rights Reserved. --- begin cisst license - do not edit --- @@ -87,8 +86,7 @@ no warranty. The complete license can be found in license.txt and the same expression. */ template -class vctFixedStrideMatrixConstIterator: - public std::iterator +class vctFixedStrideMatrixConstIterator { public: /* define most types from vctContainerTraits */ @@ -97,12 +95,9 @@ class vctFixedStrideMatrixConstIterator: /*! The type of the iterator itself. */ typedef vctFixedStrideMatrixConstIterator<_elementType, _columnStride, _numColumns, _rowStride> ThisType; - /*! Base type for this iterator, i.e. std::iterator. */ - typedef std::iterator BaseType; - /*! Type (i.e. category) of iterator, i.e. std::random_access_iterator_tag. */ - typedef typename BaseType::iterator_category iterator_category; + typedef typename std::random_access_iterator_tag iterator_category; enum {COL_STRIDE = _columnStride, ROW_STRIDE = _rowStride}; enum {NUM_COLUMNS = _numColumns}; diff --git a/cisstVector/vctFixedStrideVectorIterator.h b/cisstVector/vctFixedStrideVectorIterator.h index 1130a2bdb..af94aa2d1 100644 --- a/cisstVector/vctFixedStrideVectorIterator.h +++ b/cisstVector/vctFixedStrideVectorIterator.h @@ -6,8 +6,7 @@ Author(s): Ofri Sadowsky, Anton Deguet Created on: 2003-09-30 - (C) Copyright 2003-2013 Johns Hopkins University (JHU), All Rights - Reserved. + (C) Copyright 2003-2025 Johns Hopkins University (JHU), All Rights Reserved. --- begin cisst license - do not edit --- @@ -59,8 +58,7 @@ no warranty. The complete license can be found in license.txt and \sa vctFixedStrideVectorIterator */ template -class vctFixedStrideVectorConstIterator: - public std::iterator +class vctFixedStrideVectorConstIterator { public: /* define most types from vctContainerTraits */ @@ -69,12 +67,9 @@ class vctFixedStrideVectorConstIterator: /*! This of the iterator itself. */ typedef vctFixedStrideVectorConstIterator<_elementType, _stride> ThisType; - /*! Base type for this iterator, i.e. std::iterator. */ - typedef std::iterator BaseType; - /*! Type (i.e. category) of iterator, i.e. std::random_access_iterator_tag. */ - typedef typename BaseType::iterator_category iterator_category; + typedef typename std::random_access_iterator_tag iterator_category; /* Stride between the elements of a vector. */ enum {STRIDE = _stride}; diff --git a/cisstVector/vctVarStrideMatrixIterator.h b/cisstVector/vctVarStrideMatrixIterator.h index 1907c1498..ffd531493 100644 --- a/cisstVector/vctVarStrideMatrixIterator.h +++ b/cisstVector/vctVarStrideMatrixIterator.h @@ -6,8 +6,7 @@ Author(s): Ofri Sadowsky, Anton Deguet Created on: 2004-07-02 - (C) Copyright 2004-2013 Johns Hopkins University (JHU), All Rights - Reserved. + (C) Copyright 2004-2025 Johns Hopkins University (JHU), All Rights Reserved. --- begin cisst license - do not edit --- @@ -37,8 +36,7 @@ no warranty. The complete license can be found in license.txt and \sa vctVarStrideMatrixIterator */ template -class vctVarStrideMatrixConstIterator: - public std::iterator +class vctVarStrideMatrixConstIterator { public: /* define most types from vctContainerTraits */ @@ -47,12 +45,9 @@ class vctVarStrideMatrixConstIterator: /*! The type of the iterator itself. */ typedef vctVarStrideMatrixConstIterator<_elementType> ThisType; - /*! Base type for this iterator, i.e. std::iterator. */ - typedef std::iterator BaseType; - /*! Type (i.e. category) of iterator, i.e. std::random_access_iterator_tag. */ - typedef typename BaseType::iterator_category iterator_category; + typedef typename std::random_access_iterator_tag iterator_category; protected: /*! The data member points to the object being refered by this diff --git a/cisstVector/vctVarStrideNArrayIterator.h b/cisstVector/vctVarStrideNArrayIterator.h index 665ed5db1..7f025afa8 100644 --- a/cisstVector/vctVarStrideNArrayIterator.h +++ b/cisstVector/vctVarStrideNArrayIterator.h @@ -6,8 +6,7 @@ Author(s): Daniel Li, Ofri Sadowsky, Anton Deguet Created on: 2006-07-11 - (C) Copyright 2006-2013 Johns Hopkins University (JHU), All Rights - Reserved. + (C) Copyright 2006-2025 Johns Hopkins University (JHU), All Rights Reserved. --- begin cisst license - do not edit --- @@ -43,9 +42,7 @@ no warranty. The complete license can be found in license.txt and \sa vctVarStrideNArrayIterator */ template -class vctVarStrideNArrayConstIterator: - public std::iterator +class vctVarStrideNArrayConstIterator { public: /* define most types from vctContainerOwnerTraits and vctNArrayTraits */ @@ -64,12 +61,9 @@ class vctVarStrideNArrayConstIterator: iterator points. */ typedef _ownerType OwnerType; - /*! Base type for this iterator, i.e. std::iterator. */ - typedef std::iterator BaseType; - /*! Type (i.e. category) of iterator, i.e. std::random_access_iterator_tag. */ - typedef typename BaseType::iterator_category iterator_category; + typedef typename std::random_access_iterator_tag iterator_category; protected: /*! Pointer to the address of the container being referred to diff --git a/cisstVector/vctVarStrideVectorIterator.h b/cisstVector/vctVarStrideVectorIterator.h index 26e00ac5e..0631b0f25 100644 --- a/cisstVector/vctVarStrideVectorIterator.h +++ b/cisstVector/vctVarStrideVectorIterator.h @@ -6,8 +6,7 @@ Author(s): Ofri Sadowsky, Anton Deguet Created on: 2004-07-02 - (C) Copyright 2004-2013 Johns Hopkins University (JHU), All Rights - Reserved. + (C) Copyright 2004-2025 Johns Hopkins University (JHU), All Rights Reserved. --- begin cisst license - do not edit --- @@ -53,8 +52,7 @@ no warranty. The complete license can be found in license.txt and \sa vctVarStrideVectorIterator */ template -class vctVarStrideVectorConstIterator: - public std::iterator +class vctVarStrideVectorConstIterator { public: /* define most types from vctContainerTraits */ @@ -63,12 +61,9 @@ class vctVarStrideVectorConstIterator: /*! The type of the iterator itself. */ typedef vctVarStrideVectorConstIterator<_elementType> ThisType; - /*! Base type for this iterator, i.e. std::iterator. */ - typedef std::iterator BaseType; - /*! Type (i.e. category) of iterator, i.e. std::random_access_iterator_tag. */ - typedef typename BaseType::iterator_category iterator_category; + typedef typename std::random_access_iterator_tag iterator_category; protected: /*! The data member points to the object being refered by this