OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Use of C++17 deprecated feature: std::iterator #2036

This commit is contained in:
Davis King 2020-03-29 10:55:06 -04:00
parent f42f100d0f
commit fd0145345e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlib/matrix/matrix_exp.h
View File

@ -57,7 +57,7 @@ namespace dlib
template <typename EXP> class matrix_exp; template <typename EXP> class matrix_exp;
template <typename EXP> template <typename EXP>
class matrix_exp_iterator : public std::iterator<std::forward_iterator_tag, typename matrix_traits<EXP>::type> class matrix_exp_iterator
{ {
friend class matrix_exp<EXP>; friend class matrix_exp<EXP>;
matrix_exp_iterator(const EXP& m_, long r_, long c_) matrix_exp_iterator(const EXP& m_, long r_, long c_)
@ -72,9 +72,13 @@ namespace dlib
matrix_exp_iterator() : r(0), c(0), nc(0), m(0) {} matrix_exp_iterator() : r(0), c(0), nc(0), m(0) {}
typedef typename matrix_traits<EXP>::type type; using type = typename matrix_traits<EXP>::type;
typedef type value_type; using const_ret_type = typename matrix_traits<EXP>::const_ret_type;
typedef typename matrix_traits<EXP>::const_ret_type const_ret_type; using iterator_category = std::forward_iterator_tag;
using value_type = type;
using difference_type = std::ptrdiff_t;
using pointer = value_type*;
using reference = value_type&;
bool operator == ( const matrix_exp_iterator& itr) const bool operator == ( const matrix_exp_iterator& itr) const