Mercurial > octave
diff libinterp/corefcn/load-path.cc @ 27932:b018f553fd85
maint: Use Octave coding conventions in libinterp/
* __ftp__.cc, __ichol__.cc, call-stack.cc, error.h, event-manager.cc,
file-io.cc, gl-render.cc, graphics.cc, help.cc, input.cc, interpreter.cc,
load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, mex.cc, oct-hist.cc,
oct-stream.cc, sighandlers.h, stack-frame.cc, stack-frame.h, strfns.cc,
syminfo.cc, sysdep.cc, text-engine.h, url-handle-manager.h, urlwrite.cc,
xpow.cc, __init_fltk__.cc, __ode15__.cc, ccolamd.cc, colamd.cc, cdef-class.cc,
cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-object.cc,
cdef-package.h, cdef-property.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc,
ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.h, ov-java.cc, ov-typeinfo.h,
bp-table.cc, jit-ir.h, jit-typeinfo.h, pt-classdef.h, pt-eval.cc, pt-eval.h,
pt-idx.cc: Use Octave coding conventions in libinterp.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 10 Jan 2020 17:25:12 -0800 |
| parents | bd51beb6205e |
| children | 262cdfc6faf9 |
line wrap: on
line diff
--- a/libinterp/corefcn/load-path.cc Fri Jan 10 13:19:38 2020 -0800 +++ b/libinterp/corefcn/load-path.cc Fri Jan 10 17:25:12 2020 -0800 @@ -172,7 +172,8 @@ if (! dir_name.empty ()) { std::string pfname = dir_name + sys::file_ops::dir_sep_str () - + "private" + sys::file_ops::dir_sep_str () + fname; + + "private" + sys::file_ops::dir_sep_str () + + fname; sys::file_stat fs (pfname); @@ -447,8 +448,8 @@ // get base name, allowing "@class/method.m" (bug #41514) std::string base_file = (file.length () > dir.length ()) - ? file.substr (dir.length () + 1) - : sys::env::base_pathname (file); + ? file.substr (dir.length () + 1) + : sys::env::base_pathname (file); std::string lp_file = find_file (base_file);