Mercurial > octave

diff libinterp/octave-value/ov-java.cc @ 21736:0504351a45e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use namespace for file_stat classes * file-stat.h, file-stat.cc: Put base_file_stat, file_stat, and file_fstat in octave::sys namespace. Change all uses.
author John W. Eaton <jwe@octave.org>
date Thu, 19 May 2016 01:22:06 -0400
parents cb0fdd941d84
children c4ab2e54f100
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc	Thu May 19 01:05:45 2016 -0400
+++ b/libinterp/octave-value/ov-java.cc	Thu May 19 01:22:06 2016 -0400
@@ -433,7 +433,7 @@
 
       std::string jar_file = java_dir + sep + "octave.jar";
 
-      file_stat jar_exists (jar_file);
+      octave::sys::file_stat jar_exists (jar_file);
 
       if (jar_exists)
         {
@@ -457,11 +457,11 @@
             {
               std::string filename = cp_list[i];
               std::string cp_file = filename;
-              file_stat   cp_exists;
+              octave::sys::file_stat   cp_exists;
 
               // Try to find classpath file in the current directory.
 
-              cp_exists = file_stat (cp_file);
+              cp_exists = octave::sys::file_stat (cp_file);
               if (cp_exists)
                 {
                   // File found.  Add its contents to the static classpath.
@@ -475,7 +475,7 @@
                 {
                   cp_file = "~" + sep + filename;
                   cp_file = octave::sys::file_ops::tilde_expand (cp_file);
-                  cp_exists = file_stat (cp_file);
+                  cp_exists = octave::sys::file_stat (cp_file);
                   if (cp_exists)
                     {
                       // File found.  Add its contents to the static classpath.
@@ -489,7 +489,7 @@
               if (cwd != java_dir)
                 {
                   cp_file = java_dir + sep + filename;
-                  cp_exists = file_stat (cp_file);
+                  cp_exists = octave::sys::file_stat (cp_file);
                   if (cp_exists)
                     {
                       // File found.  Add its contents to the static classpath.