Mercurial > octave
diff libinterp/octave-value/ov-java.cc @ 21733:cb0fdd941d84
use namespace for system file_ops class
* file-ops.h, file-ops.cc: Put file_ops class and related functions in
octave::sys:: namespace. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 19 May 2016 00:33:18 -0400 |
| parents | 6a1eded90355 |
| children | 0504351a45e6 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc Wed May 18 14:58:29 2016 -0400 +++ b/libinterp/octave-value/ov-java.cc Thu May 19 00:33:18 2016 -0400 @@ -366,7 +366,7 @@ java_dir = octave::sys::env::getenv ("OCTAVE_JAVA_DIR"); if (java_dir.empty ()) - java_dir = Vfcn_file_dir + file_ops::dir_sep_str () + "java"; + java_dir = Vfcn_file_dir + octave::sys::file_ops::dir_sep_str () + "java"; } return java_dir; @@ -410,7 +410,7 @@ // append content of line without whitespace int last = line.find_last_not_of (" \t\f\v\r\n"); - classpath.append (file_ops::tilde_expand (line.substr (0, last+1))); + classpath.append (octave::sys::file_ops::tilde_expand (line.substr (0, last+1))); } } } @@ -429,7 +429,7 @@ // find octave.jar file if (! retval.empty ()) { - std::string sep = file_ops::dir_sep_str (); + std::string sep = octave::sys::file_ops::dir_sep_str (); std::string jar_file = java_dir + sep + "octave.jar"; @@ -474,7 +474,7 @@ if (cwd != home_dir) { cp_file = "~" + sep + filename; - cp_file = file_ops::tilde_expand (cp_file); + cp_file = octave::sys::file_ops::tilde_expand (cp_file); cp_exists = file_stat (cp_file); if (cp_exists) { @@ -686,7 +686,7 @@ vm_args.add ("-Djava.class.path=" + initial_class_path ()); vm_args.add ("-Xrs"); vm_args.add ("-Djava.system.class.loader=org.octave.OctClassLoader"); - vm_args.read_java_opts (initial_java_dir () + file_ops::dir_sep_str () + + vm_args.read_java_opts (initial_java_dir () + octave::sys::file_ops::dir_sep_str () + "java.opts"); #if ! defined (__APPLE__) && ! defined (__MACH__)