Mercurial > octave
diff liboctave/util/file-info.cc @ 29572:aef11bb4e6d1
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.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 28 Apr 2021 22:57:42 -0400 |
parents | 0a5b15007766 |
children | 796f54d4ddbf |
line wrap: on
line diff
--- a/liboctave/util/file-info.cc Wed Apr 28 22:24:21 2021 -0400 +++ b/liboctave/util/file-info.cc Wed Apr 28 22:57:42 2021 -0400 @@ -37,7 +37,7 @@ namespace octave { - std::string file_info::get_line (size_t line) const + std::string file_info::get_line (std::size_t line) const { std::string retval; @@ -46,8 +46,8 @@ if (line < m_offsets.size ()) { - size_t bol = m_offsets[line-1]; - size_t eol = m_offsets[line]; + std::size_t bol = m_offsets[line-1]; + std::size_t eol = m_offsets[line]; while (eol > 0 && eol > bol && (m_file_buf[eol-1] == '\n' || m_file_buf[eol-1] == '\r')) @@ -60,11 +60,11 @@ } std::deque<std::string> - file_info::get_lines (size_t line, size_t num_lines) const + file_info::get_lines (std::size_t line, std::size_t num_lines) const { std::deque<std::string> retval; - for (size_t i = line; i < line+num_lines; i++) + for (std::size_t i = line; i < line+num_lines; i++) retval.push_back (get_line (i)); return retval; @@ -81,7 +81,7 @@ if (! fs) (*current_liboctave_error_handler) ("no such file, '%s'", fname.c_str ()); - size_t sz = fs.size (); + std::size_t sz = fs.size (); std::ifstream file = sys::ifstream (fname.c_str (), std::ios::in | std::ios::binary); @@ -103,15 +103,15 @@ return retval; } - std::vector<size_t> file_info::get_line_offsets (const std::string& buf) + std::vector<std::size_t> file_info::get_line_offsets (const std::string& buf) { - std::deque<size_t> tmp_offsets; + std::deque<std::size_t> tmp_offsets; tmp_offsets.push_back (0); - size_t len = buf.length (); + std::size_t len = buf.length (); - for (size_t i = 0; i < len; i++) + for (std::size_t i = 0; i < len; i++) { char c = buf[i]; @@ -130,10 +130,10 @@ tmp_offsets.push_back (len-1); - size_t n = tmp_offsets.size (); + std::size_t n = tmp_offsets.size (); - std::vector<size_t> retval (n); - size_t i = 0; + std::vector<std::size_t> retval (n); + std::size_t i = 0; for (auto& elt : tmp_offsets) retval[i++] = elt;