Mercurial > octave
diff libinterp/corefcn/oct-hist.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 | 939bef0b66e0 |
| children | 81d26e8481a6 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-hist.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/oct-hist.cc Sat Aug 14 22:48:52 2021 -0400 @@ -496,7 +496,7 @@ file.close (); - int(*unlink_fptr)(const std::string&) = octave::sys::unlink; + int(*unlink_fptr)(const std::string&) = sys::unlink; unwind_action unlink_action (unlink_fptr, name); unwind_protect_var<bool> upv (m_input_from_tmp_file, true); @@ -514,7 +514,7 @@ if (name.empty ()) return; - int(*unlink_fptr)(const std::string&) = octave::sys::unlink; + int(*unlink_fptr)(const std::string&) = sys::unlink; unwind_action unlink_action (unlink_fptr, name); unwind_protect_var<bool> upv (m_input_from_tmp_file, true); @@ -618,7 +618,7 @@ if (args.length () > 2) print_usage (); - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); history_sys.do_edit_history (args); @@ -669,7 +669,7 @@ { // FIXME: should this be limited to the top-level context? - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); // Call do_history even if nargout is zero to display history list. @@ -732,7 +732,7 @@ { // FIXME: should this be limited to the top-level context? - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); if (args.length () > 2) print_usage (); @@ -768,14 +768,14 @@ { octave_value retval; - std::string old_history_control = octave::command_history::histcontrol (); + std::string old_history_control = command_history::histcontrol (); std::string tmp = old_history_control; retval = set_internal_variable (tmp, args, nargout, "history_control"); if (tmp != old_history_control) - octave::command_history::process_histcontrol (tmp); + command_history::process_histcontrol (tmp); return retval; } @@ -794,7 +794,7 @@ { octave_value retval; - int old_history_size = octave::command_history::size (); + int old_history_size = command_history::size (); int tmp = old_history_size; @@ -803,7 +803,7 @@ std::numeric_limits<int>::max ()); if (tmp != old_history_size) - octave::command_history::set_size (tmp); + command_history::set_size (tmp); return retval; } @@ -849,14 +849,14 @@ { octave_value retval; - std::string old_history_file = octave::command_history::file (); + std::string old_history_file = command_history::file (); std::string tmp = old_history_file; retval = set_internal_variable (tmp, args, nargout, "history_file"); if (tmp != old_history_file) - octave::command_history::set_file (tmp); + command_history::set_file (tmp); return retval; } @@ -882,7 +882,7 @@ @seealso{strftime, history_file, history_size, history_save} @end deftypefn */) { - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); return history_sys.timestamp_format_string (args, nargout); } @@ -912,14 +912,14 @@ { octave_value retval; - bool old_history_save = ! octave::command_history::ignoring_entries (); + bool old_history_save = ! command_history::ignoring_entries (); bool tmp = old_history_save; retval = set_internal_variable (tmp, args, nargout, "history_save"); if (tmp != old_history_save) - octave::command_history::ignore_entries (! tmp); + command_history::ignore_entries (! tmp); return retval; }