Mercurial > octave
diff libinterp/corefcn/dlmread.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 32c3a5805893 |
| children | a61e1a0f6024 |
line wrap: on
line diff
--- a/libinterp/corefcn/dlmread.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dlmread.cc Sat Aug 14 22:48:52 2021 -0400 @@ -227,12 +227,12 @@ // Filename. std::string fname (args(0).string_value ()); - std::string tname = octave::sys::file_ops::tilde_expand (fname); + std::string tname = sys::file_ops::tilde_expand (fname); - tname = octave::find_data_file_in_load_path ("dlmread", tname); + tname = find_data_file_in_load_path ("dlmread", tname); #if defined (OCTAVE_USE_WINDOWS_API) - std::wstring wname = octave::sys::u8_to_wstring (tname); + std::wstring wname = sys::u8_to_wstring (tname); input_file.open (wname.c_str (), std::ios::in); #else input_file.open (tname.c_str (), std::ios::in); @@ -245,9 +245,9 @@ } else if (args(0).is_scalar_type ()) { - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); - octave::stream is = streams.lookup (args(0), "dlmread"); + stream is = streams.lookup (args(0), "dlmread"); input = is.input_stream (); @@ -262,7 +262,7 @@ if (nargin > 1) { if (args(1).is_sq_string ()) - sep = octave::do_string_escapes (args(1).string_value ()); + sep = do_string_escapes (args(1).string_value ()); else sep = args(1).string_value (); } @@ -340,7 +340,7 @@ char *prev_locale = std::setlocale (LC_ALL, nullptr); std::string old_locale (prev_locale ? prev_locale : ""); std::setlocale (LC_ALL, "C"); - octave::unwind_action act + unwind_action act ([old_locale] () { std::setlocale (LC_ALL, old_locale.c_str ()); }); std::string line; @@ -481,7 +481,7 @@ tmp_stream.str (str); tmp_stream.clear (); - double x = octave::read_value<double> (tmp_stream); + double x = read_value<double> (tmp_stream); if (tmp_stream) { if (tmp_stream.eof ()) @@ -523,7 +523,7 @@ } else { - double y = octave::read_value<double> (tmp_stream); + double y = read_value<double> (tmp_stream); if (! iscmplx && y != 0.0) { @@ -540,7 +540,7 @@ } else { - // octave::read_value<double>() parsing failed + // read_value<double>() parsing failed j++; // Leave data initialized to empty_value }