Mercurial > octave

diff liboctave/system/file-stat.cc @ 23696:08036a7f3660

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2bed6d6bb2e2
children 057a894914df
line wrap: on
line diff
--- a/liboctave/system/file-stat.cc	Mon Jun 26 09:02:21 2017 -0400
+++ b/liboctave/system/file-stat.cc	Mon Jun 26 09:05:37 2017 -0400
@@ -158,7 +158,7 @@
 
     int
     base_file_stat::is_newer (const std::string& file,
-                              const octave::sys::time& time)
+                              const sys::time& time)
     {
       file_stat fs (file);
 
@@ -184,11 +184,11 @@
           initialized = false;
           fail = false;
 
-          std::string full_file_name = octave::sys::file_ops::tilde_expand (file_name);
+          std::string full_file_name = sys::file_ops::tilde_expand (file_name);
 
 #if defined (__WIN32__)
           // Remove trailing slash.
-          if (octave::sys::file_ops::is_dir_sep (full_file_name[full_file_name.length () - 1])
+          if (sys::file_ops::is_dir_sep (full_file_name[full_file_name.length () - 1])
               && full_file_name.length () != 1
               && ! (full_file_name.length () == 3 && full_file_name[1] == ':'))
             full_file_name.resize (full_file_name.length () - 1);
@@ -216,9 +216,9 @@
             }
           else
             {
-              m_atime = octave::sys::time (sys_atime);
-              m_mtime = octave::sys::time (sys_mtime);
-              m_ctime = octave::sys::time (sys_ctime);
+              m_atime = sys::time (sys_atime);
+              m_mtime = sys::time (sys_mtime);
+              m_ctime = sys::time (sys_ctime);
             }
 
           initialized = true;
@@ -248,9 +248,9 @@
             }
           else
             {
-              m_atime = octave::sys::time (sys_atime);
-              m_mtime = octave::sys::time (sys_mtime);
-              m_ctime = octave::sys::time (sys_ctime);
+              m_atime = sys::time (sys_atime);
+              m_mtime = sys::time (sys_mtime);
+              m_ctime = sys::time (sys_ctime);
             }
 
           initialized = true;