Mercurial > octave
comparison libinterp/corefcn/utils.cc @ 27277:db687716fed6
style fixes: generally aim to break long lines before operators, not after
Files affected: Table.cc, dw-main-window.cc, file-editor-tab.cc,
file-editor.cc, main-window.cc, build-env.in.cc, __ichol__.cc,
__magick_read__.cc, besselj.cc, bsxfun.cc, cellfun.cc, data.cc,
dlmread.cc, error.cc, fcn-info.cc, file-io.cc, gl-render.cc,
gl2ps-print.cc, graphics.cc, load-save.cc, ls-mat4.cc, ls-mat5.cc,
matrix_type.cc, mex.cc, oct-stream.cc, pr-output.cc, quadcc.cc,
rand.cc, sparse-xpow.cc, syscalls.cc, sysdep.cc, utils.cc,
__init_fltk__.cc, __init_gnuplot__.cc, chol.cc, fftw.cc, qr.cc,
cdef-class.cc, cdef-object.cc, ov-bool-sparse.cc, ov-cell.cc,
ov-class.cc, ov-cx-diag.cc, ov-cx-sparse.cc, ov-fcn-handle.cc,
ov-flt-cx-diag.cc, ov-flt-re-diag.cc, ov-str-mat.cc, ov-struct.cc,
ov.cc, op-b-sbm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-scm-scm.cc,
op-sm-scm.cc, op-sm-sm.cc, jit-typeinfo.cc, pt-cbinop.cc, pt-cbinop.h,
pt-eval.cc, CSparse.cc, MatrixType.cc, dSparse.cc, eigs-base.cc,
lo-specfun.cc, oct-fftw.cc, cmd-edit.cc, lo-regexp.cc, oct-inttypes.h,
url-transfer.cc, mkoctfile.in.cc, and octave-svgconvert.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 21 Jul 2019 10:21:01 -0400 |
| parents | 6b0c61a5a0f0 |
| children | 1c8b20731af4 |
comparison
equal
deleted
inserted
replaced
| 27276:7455523fdf01 | 27277:db687716fed6 |
|---|---|
| 451 bool local_file_ok | 451 bool local_file_ok |
| 452 = fs.exists () && (fs.is_reg () || ! require_regular_file); | 452 = fs.exists () && (fs.is_reg () || ! require_regular_file); |
| 453 | 453 |
| 454 if (! local_file_ok) | 454 if (! local_file_ok) |
| 455 { | 455 { |
| 456 load_path& lp = | 456 load_path& lp = __get_load_path__ ("find_data_file_in_load_path"); |
| 457 __get_load_path__ ("find_data_file_in_load_path"); | |
| 458 | 457 |
| 459 // Not directly found; search load path. | 458 // Not directly found; search load path. |
| 460 std::string tmp | 459 std::string tmp = sys::env::make_absolute (lp.find_file (fname)); |
| 461 = sys::env::make_absolute (lp.find_file (fname)); | |
| 462 | 460 |
| 463 if (! tmp.empty ()) | 461 if (! tmp.empty ()) |
| 464 { | 462 { |
| 465 warn_data_file_in_path (fcn, tmp); | 463 warn_data_file_in_path (fcn, tmp); |
| 466 | 464 |