Skip to content

GitLab

"git@developer.sourcefind.cn:renzhc/diffusers_dcu.git" did not exist on "3dcc75cbd4f924070cf9ebbbc1876ee04a0638c4"
Commit fd014534 authored by Davis King's avatar Davis King
Browse files

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

parent f42f100d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
dlib/matrix/matrix_exp.h
View file @ fd014534
...@@ -57,7 +57,7 @@ namespace dlib ...@@ -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 ...@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment