File tree Expand file tree Collapse file tree 4 files changed +24
-7
lines changed
Expand file tree Collapse file tree 4 files changed +24
-7
lines changed Original file line number Diff line number Diff line change @@ -57,8 +57,13 @@ namespace drmemtrace {
5757// Iterates over files: skips sub-directories.
5858// Returns the basenames of the files (i.e., not absolute paths).
5959// This class is not thread-safe.
60- class directory_iterator_t : public std ::iterator<std::input_iterator_tag, std::string> {
60+ class directory_iterator_t {
6161public:
62+ using iterator_category = std::input_iterator_tag;
63+ using value_type = std::string;
64+ using difference_type = std::ptrdiff_t ;
65+ using pointer = value_type *;
66+ using reference = value_type &;
6267 directory_iterator_t ()
6368 {
6469 }
Original file line number Diff line number Diff line change @@ -77,9 +77,13 @@ namespace drmemtrace {
7777 * also provides more information about the trace using the
7878 * #dynamorio::drmemtrace::memtrace_stream_t API.
7979 */
80- class reader_t : public std ::iterator<std::input_iterator_tag, memref_t >,
81- public memtrace_stream_t {
80+ class reader_t : public memtrace_stream_t {
8281public:
82+ using iterator_category = std::input_iterator_tag;
83+ using value_type = memref_t ;
84+ using difference_type = std::ptrdiff_t ;
85+ using pointer = value_type *;
86+ using reference = value_type &;
8387 reader_t ()
8488 {
8589 cur_ref_ = {};
Original file line number Diff line number Diff line change @@ -111,9 +111,13 @@ namespace drmemtrace {
111111 * record_reader_t is expected to provide the exact stream of
112112 * #dynamorio::drmemtrace::trace_entry_t as stored on disk.
113113 */
114- class record_reader_t : public std ::iterator<std::input_iterator_tag, trace_entry_t >,
115- public memtrace_stream_t {
114+ class record_reader_t : public memtrace_stream_t {
116115public:
116+ using iterator_category = std::input_iterator_tag;
117+ using value_type = trace_entry_t ;
118+ using difference_type = std::ptrdiff_t ;
119+ using pointer = value_type *;
120+ using reference = value_type &;
117121 record_reader_t (int verbosity, const char *prefix)
118122 : verbosity_(verbosity)
119123 , output_prefix_(prefix)
Original file line number Diff line number Diff line change @@ -73,9 +73,13 @@ class reg_id_set_t {
7373 memset (present_, 0 , sizeof (present_));
7474 }
7575
76- class reg_id_set_iterator_t
77- : public std::iterator<std::input_iterator_tag, reg_id_t > {
76+ class reg_id_set_iterator_t {
7877 public:
78+ using iterator_category = std::input_iterator_tag;
79+ using value_type = reg_id_t ;
80+ using difference_type = std::ptrdiff_t ;
81+ using pointer = value_type *;
82+ using reference = value_type &;
7983 reg_id_set_iterator_t (reg_id_set_t *set)
8084 : set_(set)
8185 , index_(-1 )
You can’t perform that action at this time.
0 commit comments