Mercurial > octave
diff liboctave/util/url-transfer.cc @ 23696:08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
* octave-gui.cc, dynamic-ld.h, ft-text-renderer.cc, gl-render.cc,
gl-render.h, gl2ps-print.cc, input.cc, input.h, interpreter.cc,
load-path.cc, load-path.h, oct-stream.cc, sighandlers.cc, symtab.cc,
symtab.h, __ode15__.cc, gzip.cc, octave.cc, lex.ll, oct-parse.in.yy,
parse.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.h,
pt-classdef.h, pt-decl.h, pt-eval.cc, pt-eval.h, pt-exp.h,
pt-fcn-handle.cc, pt-idx.cc, pt-misc.h, pt-select.h, pt-stmt.h,
pt-tm-const.cc, pt-tm-const.h, pt.cc, aepbalance.cc, chol.cc,
gepbalance.cc, gsvd.cc, hess.cc, lo-mappers.h, lo-specfun.cc, lu.cc,
qr.cc, qrp.cc, schur.cc, sparse-chol.cc, sparse-lu.cc, sparse-qr.cc,
svd.cc, child-list.cc, dir-ops.cc, file-ops.cc, file-stat.cc,
file-stat.h, lo-sysdep.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc,
cmd-hist.cc, oct-glob.cc, oct-locbuf.cc, oct-mutex.cc, oct-mutex.h,
oct-shlib.cc, oct-shlib.h, pathsearch.cc, url-transfer.cc,
url-transfer.h: Remove octave:: namespace tag from symbols used
inside octave namespace.
* oct-conf-post.in.h (OCTAVE_USE_DEPRECATED_FUNCTIONS): Don't define.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 26 Jun 2017 09:05:37 -0400 |
| parents | 21baad6b35c4 |
| children | 336f89b6208b |
line wrap: on
line diff
--- a/liboctave/util/url-transfer.cc Mon Jun 26 09:02:21 2017 -0400 +++ b/liboctave/util/url-transfer.cc Mon Jun 26 09:05:37 2017 -0400 @@ -50,20 +50,20 @@ void base_url_transfer::delete_file (const std::string& file) { - octave::sys::unlink (file); + sys::unlink (file); } void base_url_transfer::mget_directory (const std::string& directory, const std::string& target) { - std::string sep = octave::sys::file_ops::dir_sep_str (); - octave::sys::file_stat fs (directory); + std::string sep = sys::file_ops::dir_sep_str (); + sys::file_stat fs (directory); if (! fs || ! fs.is_dir ()) { std::string msg; - int status = octave::sys::mkdir (directory, 0777, msg); + int status = sys::mkdir (directory, 0777, msg); if (status < 0) { @@ -78,7 +78,7 @@ if (good ()) { - octave::unwind_protect_safe frame; + unwind_protect_safe frame; frame.add_fcn (reset_path, this); @@ -108,7 +108,7 @@ break; } - octave::unwind_protect_safe frame2; + unwind_protect_safe frame2; frame2.add_fcn (delete_file, realfile); @@ -134,7 +134,7 @@ std::string realdir = (base.empty () - ? directory : base + octave::sys::file_ops::dir_sep_str () + directory); + ? directory : base + sys::file_ops::dir_sep_str () + directory); mkdir (directory); @@ -145,11 +145,11 @@ if (good ()) { - octave::unwind_protect_safe frame; + unwind_protect_safe frame; frame.add_fcn (reset_path, this); - octave::sys::dir_entry dirlist (realdir); + sys::dir_entry dirlist (realdir); if (dirlist) { @@ -162,8 +162,8 @@ if (file == "." || file == "..") continue; - std::string realfile = realdir + octave::sys::file_ops::dir_sep_str () + file; - octave::sys::file_stat fs (realfile); + std::string realfile = realdir + sys::file_ops::dir_sep_str () + file; + sys::file_stat fs (realfile); if (! fs.exists ()) { @@ -416,7 +416,7 @@ { struct curl_slist *slist = nullptr; - octave::unwind_protect frame; + unwind_protect frame; frame.add_fcn (curl_slist_free_all, slist); std::string cmd = "rnfr " + oldname; @@ -584,7 +584,7 @@ struct curl_slist *slist = nullptr; - octave::unwind_protect frame; + unwind_protect frame; frame.add_fcn (curl_slist_free_all, slist); slist = curl_slist_append (slist, "pwd"); @@ -748,7 +748,7 @@ { struct curl_slist *slist = nullptr; - octave::unwind_protect frame; + unwind_protect frame; frame.add_fcn (curl_slist_free_all, slist);