Mercurial > octave
diff libinterp/corefcn/syminfo.cc @ 29654:d13d090cb03a stable
use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
Files affected: make_int.cc, file-editor-tab.cc, octave-qscintilla.cc,
Cell.cc, Cell.h, call-stack.cc, call-stack.h, cellfun.cc, data.cc,
debug.cc, dlmread.cc, error.cc, event-queue.h, fcn-info.cc,
fcn-info.h, file-io.cc, ft-text-renderer.cc, gl2ps-print.cc,
graphics.cc, graphics.in.h, help.cc, hex2num.cc, input.cc,
latex-text-renderer.cc, load-path.cc, load-save.cc, load-save.h,
ls-hdf5.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-oct-text.cc, mex.cc,
mexproto.h, mxarray.h, oct-map.cc, oct-stream.cc, oct-stream.h,
pager.cc, pager.h, pr-output.cc, regexp.cc, settings.h,
stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, symrec.h,
symscope.cc, symscope.h, symtab.cc, sysdep.cc, toplev.cc, utils.cc,
utils.h, variables.cc, __fltk_uigetfile__.cc, __init_fltk__.cc,
audioread.cc, gzip.cc, cdef-class.cc, cdef-manager.cc, cdef-method.cc,
cdef-object.cc, cdef-object.h, ov-base-diag.cc, ov-base-diag.h,
ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h,
ov-base-sparse.h, ov-base.cc, ov-base.h, ov-cell.cc, ov-cell.h,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc,
ov-fcn-handle.cc, ov-java.cc, ov-lazy-idx.h, ov-perm.cc, ov-perm.h,
ov-range.h, ov-str-mat.cc, ov-struct.cc, ov-struct.h, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, octave.cc, bp-table.cc, jit-ir.cc,
jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.h, lex.h, lex.ll,
oct-lvalue.cc, oct-parse.yy, parse.h, profiler.h, pt-eval.cc,
pt-eval.h, pt-jit.cc, pt-jit.h, pt-pr-code.cc, pt-tm-const.cc,
pt-tm-const.h, Array.h, CMatrix.cc, DiagArray2.h, PermMatrix.h,
Sparse.h, dMatrix.cc, fCMatrix.cc, fMatrix.cc, bsxfun-defs.cc,
oct-fftw.cc, oct-fftw.h, randpoisson.cc, sparse-chol.cc,
mx-inlines.cc, file-ops.cc, lo-sysdep.cc, oct-env.cc, oct-time.cc,
action-container.cc, action-container.h, base-list.h, caseless-str.h,
cmd-edit.cc, cmd-hist.cc, data-conv.cc, data-conv.h, f77-fcn.h,
file-info.cc, file-info.h, kpse.cc, kpse.h, lo-cutils.h, lo-hash.h,
lo-regexp.cc, oct-base64.cc, oct-base64.h, oct-binmap.h, oct-glob.cc,
oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sparse.h, oct-string.cc,
quit.cc, unwind-prot.h, url-transfer.cc, main.in.cc, mkoctfile.in.cc,
and shared-fcns.h.
(grafted from aef11bb4e6d1f303ad9de5688fcb7244ef48867e)
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 28 Apr 2021 22:57:42 -0400 |
| parents | 0a5b15007766 |
| children | 56b3e2af0298 |
line wrap: on
line diff
--- a/libinterp/corefcn/syminfo.cc Wed Apr 28 22:23:39 2021 -0400 +++ b/libinterp/corefcn/syminfo.cc Wed Apr 28 22:57:42 2021 -0400 @@ -190,7 +190,7 @@ symbol_info_list::map_value (const std::string& caller_function_name, int nesting_level) const { - size_t len = m_lst.size (); + std::size_t len = m_lst.size (); Cell name_info (len, 1); Cell size_info (len, 1); @@ -202,7 +202,7 @@ Cell nesting_info (len, 1); Cell persistent_info (len, 1); - size_t j = 0; + std::size_t j = 0; for (const auto& syminfo : m_lst) { @@ -332,8 +332,8 @@ { if (! m_lst.empty ()) { - size_t bytes = 0; - size_t elements = 0; + std::size_t bytes = 0; + std::size_t elements = 0; std::list<whos_parameter> params = parse_whos_line_format (format); @@ -362,17 +362,17 @@ symbol_info_list::parse_whos_line_format (const std::string& format) const { int idx; - size_t format_len = format.length (); + std::size_t format_len = format.length (); char garbage; std::list<whos_parameter> params; - size_t bytes1; + std::size_t bytes1; int elements1; std::string param_string = "abcenst"; Array<int> param_length (dim_vector (param_string.length (), 1)); Array<std::string> param_names (dim_vector (param_string.length (), 1)); - size_t pos_a, pos_b, pos_c, pos_e, pos_n, pos_s, pos_t; + std::size_t pos_a, pos_b, pos_c, pos_e, pos_n, pos_s, pos_t; pos_a = param_string.find ('a'); // Attributes pos_b = param_string.find ('b'); // Bytes @@ -390,7 +390,7 @@ param_names(pos_s) = "Size"; param_names(pos_t) = "Type"; - for (size_t i = 0; i < param_string.length (); i++) + for (std::size_t i = 0; i < param_string.length (); i++) param_length(i) = param_names(i).length (); // The attribute column needs size 5. @@ -406,33 +406,33 @@ str = syminfo.name (); param_length(pos_n) = ((str.length () - > static_cast<size_t> (param_length(pos_n))) + > static_cast<std::size_t> (param_length(pos_n))) ? str.length () : param_length(pos_n)); octave_value val = syminfo.value (); str = val.type_name (); param_length(pos_t) = ((str.length () - > static_cast<size_t> (param_length(pos_t))) + > static_cast<std::size_t> (param_length(pos_t))) ? str.length () : param_length(pos_t)); elements1 = val.numel (); ss1 << elements1; str = ss1.str (); param_length(pos_e) = ((str.length () - > static_cast<size_t> (param_length(pos_e))) + > static_cast<std::size_t> (param_length(pos_e))) ? str.length () : param_length(pos_e)); bytes1 = val.byte_size (); ss2 << bytes1; str = ss2.str (); param_length(pos_b) = ((str.length () - > static_cast<size_t> (param_length(pos_b))) + > static_cast<std::size_t> (param_length(pos_b))) ? str.length () : param_length (pos_b)); } idx = 0; - while (static_cast<size_t> (idx) < format_len) + while (static_cast<std::size_t> (idx) < format_len) { whos_parameter param; param.command = '\0'; @@ -446,7 +446,7 @@ int b = -1; int balance = 1; unsigned int items; - size_t pos; + std::size_t pos; std::string cmd; // Parse one command from format @@ -559,7 +559,7 @@ { // Text string, to be printed as it is ... std::string text; - size_t pos; + std::size_t pos; text = format.substr (idx, format.length ()); pos = text.find ('%'); if (pos != std::string::npos)