Mercurial > octave
diff libinterp/corefcn/oct-map.cc @ 22862:e365e87371a3
maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
* symtab.cc, call-stack.cc, comment-list.cc, defun.cc, dynamic-ld.cc,
error.cc, ft-text-renderer.cc, gl2ps-print.cc, graphics.cc, help.cc,
interpreter.cc, load-path.cc, load-save.cc, ls-mat5.cc, oct-errno.in.cc,
oct-map.cc, oct-stream.cc, octave-link.cc, profiler.cc, regexp.cc, strfind.cc,
symtab.h, txt-eng.h, urlwrite.cc, variables.cc:
maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 05 Dec 2016 13:04:12 -0800 |
| parents | 3a2b891d0b33 |
| children | ef4d915df748 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-map.cc Sat Dec 03 07:37:54 2016 -0500 +++ b/libinterp/corefcn/oct-map.cc Mon Dec 05 13:04:12 2016 -0800 @@ -94,10 +94,10 @@ octave_idx_type n = p->second; make_unique (); rep->erase (field); - for (fields_rep::iterator q = rep->begin (); q != rep->end (); q++) + for (auto& fld_idx : *rep) { - if (q->second >= n) - q->second--; + if (fld_idx.second >= n) + fld_idx.second--; } return n; @@ -112,10 +112,10 @@ make_unique (); octave_idx_type i = 0; - for (fields_rep::iterator q = rep->begin (); q != rep->end (); q++) + for (auto& fld_idx : *rep) { - octave_idx_type j = q->second; - q->second = i; + octave_idx_type j = fld_idx.second; + fld_idx.second = i; perm(i++) = j; } } @@ -161,8 +161,8 @@ octave_idx_type n = nfields (); string_vector retval(n); - for (iterator p = begin (); p != end (); p++) - retval.xelem (p->second) = p->first; + for (auto& fld_idx : *this) + retval.xelem (fld_idx.second) = fld_idx.first; return retval; } @@ -1294,7 +1294,7 @@ { for (const_iterator pa = begin (); pa != end (); pa++) { - const_iterator pb = rb.seek (key(pa)); + const_iterator pb = rb.seek (key (pa)); if (pb == rb.end ()) error ("field name mismatch in structure concatenation");