Mercurial > octave

diff libinterp/octave-value/ov-java.cc @ 25548:d6050ba12c0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Call get_ASCII_filename for std::ifstream (bug #49118). * debug.cc, dlmread.cc, help.cc, load-save.cc, urlwrite.cc, ov-java.cc, fileinfo.cc, url-transfer.cc: Call get_ASCII_filename for filename argument of std::ifstream to circumvent the wide char WinAPI.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 03 Jul 2018 21:06:00 +0200
parents 627d6bde9b8d
children ca413f326224
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc	Tue Jul 03 08:49:28 2018 -0700
+++ b/libinterp/octave-value/ov-java.cc	Tue Jul 03 21:06:00 2018 +0200
@@ -53,6 +53,7 @@
 #include "file-stat.h"
 #include "fpucw-wrappers.h"
 #include "load-path.h"
+#include "lo-sysdep.h"
 #include "oct-env.h"
 #include "oct-shlib.h"
 #include "ov-java.h"
@@ -237,7 +238,7 @@
 
     void read_java_opts (const std::string& filename)
     {
-      std::ifstream js (filename.c_str ());
+      std::ifstream js (octave::sys::get_ASCII_filename (filename).c_str ());
 
       if (! js.bad () && ! js.fail ())
         {
@@ -358,7 +359,7 @@
 {
   std::string classpath;
 
-  std::ifstream fs (filepath.c_str ());
+  std::ifstream fs (octave::sys::get_ASCII_filename (filepath).c_str ());
 
   if (! fs.bad () && ! fs.fail ())
     {