Mercurial > octave

diff libinterp/corefcn/debug.cc @ 25342:416856765a55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
be more careful with using auto in place of explicit const iterator decls * dialog.cc, m-editor/file-editor.cc, octave-qt-link.cc, call-stack.cc, debug.cc, genprops.awk, graphics.cc, gtk-manager.cc, gtk-manager.h, load-path.cc, oct-map.cc, oct-stream.cc, regexp.cc, symscope.h, symtab.h, variables.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, bp-table.cc, jit-ir.cc, jit-typeinfo.cc, pt-jit.cc, lo-regexp.cc: Only replace explicit const iterator decls with auto keyword if corresponding object is const. Otherwise, tag with a fixme comment. * lo-regexp.h (regexp::match_data::named_patterns): Now const.
author John W. Eaton <jwe@octave.org>
date Thu, 03 May 2018 00:39:14 -0400
parents 3ff9192b676e
children dd416c31761e
line wrap: on
line diff
--- a/libinterp/corefcn/debug.cc	Wed May 02 14:33:52 2018 -0700
+++ b/libinterp/corefcn/debug.cc	Thu May 03 00:39:14 2018 -0400
@@ -66,7 +66,7 @@
 
   for (size_t i = 0; i < line.size (); i++)
     {
-      auto p = line.find (i);
+      octave::bp_table::const_intmap_iterator p = line.find (i);
 
       if (p != line.end ())
         {
@@ -495,7 +495,7 @@
       retmap.assign ("line", line);
       retmap.assign ("cond", cond);
 
-      octave_map ew = bptab.stop_on_err_warn_status (false);
+      const octave_map ew = bptab.stop_on_err_warn_status (false);
       if (ew.isempty ())
         {
           retval = octave_value (retmap);