changeset 29655:32f4357ac8d9

maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 12 May 2021 19:28:54 +0200
parents 431420b46342 (current diff) d13d090cb03a (diff)
children ce4436d2b206
files examples/code/make_int.cc libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/octave-qscintilla.cc libinterp/corefcn/Cell.cc libinterp/corefcn/call-stack.cc libinterp/corefcn/cellfun.cc libinterp/corefcn/data.cc libinterp/corefcn/debug.cc libinterp/corefcn/dlmread.cc libinterp/corefcn/error.cc libinterp/corefcn/fcn-info.cc libinterp/corefcn/file-io.cc libinterp/corefcn/ft-text-renderer.cc libinterp/corefcn/gl2ps-print.cc libinterp/corefcn/graphics.cc libinterp/corefcn/graphics.in.h libinterp/corefcn/help.cc libinterp/corefcn/hex2num.cc libinterp/corefcn/input.cc libinterp/corefcn/load-path.cc libinterp/corefcn/load-save.cc libinterp/corefcn/load-save.h libinterp/corefcn/ls-mat-ascii.cc libinterp/corefcn/ls-mat5.cc libinterp/corefcn/mex.cc libinterp/corefcn/mexproto.h libinterp/corefcn/mxarray.h libinterp/corefcn/oct-map.cc libinterp/corefcn/oct-stream.cc libinterp/corefcn/oct-stream.h libinterp/corefcn/pager.cc libinterp/corefcn/pager.h libinterp/corefcn/pr-output.cc libinterp/corefcn/regexp.cc libinterp/corefcn/stack-frame.cc libinterp/corefcn/stack-frame.h libinterp/corefcn/strfns.cc libinterp/corefcn/symscope.cc libinterp/corefcn/sysdep.cc libinterp/corefcn/toplev.cc libinterp/corefcn/utils.cc libinterp/corefcn/utils.h libinterp/corefcn/variables.cc libinterp/dldfcn/__init_fltk__.cc libinterp/dldfcn/audioread.cc libinterp/dldfcn/gzip.cc libinterp/octave-value/cdef-class.cc libinterp/octave-value/cdef-object.cc libinterp/octave-value/cdef-object.h libinterp/octave-value/ov-base-diag.cc libinterp/octave-value/ov-base-diag.h libinterp/octave-value/ov-base-mat.cc libinterp/octave-value/ov-base-mat.h libinterp/octave-value/ov-base-scalar.h libinterp/octave-value/ov-base-sparse.h libinterp/octave-value/ov-base.cc libinterp/octave-value/ov-base.h libinterp/octave-value/ov-cell.cc libinterp/octave-value/ov-cell.h libinterp/octave-value/ov-ch-mat.cc libinterp/octave-value/ov-class.cc libinterp/octave-value/ov-class.h libinterp/octave-value/ov-classdef.cc libinterp/octave-value/ov-fcn-handle.cc libinterp/octave-value/ov-java.cc libinterp/octave-value/ov-lazy-idx.h libinterp/octave-value/ov-perm.cc libinterp/octave-value/ov-perm.h libinterp/octave-value/ov-range.h libinterp/octave-value/ov-str-mat.cc libinterp/octave-value/ov-struct.cc libinterp/octave-value/ov-struct.h libinterp/octave-value/ov-usr-fcn.cc libinterp/octave-value/ov-usr-fcn.h libinterp/octave-value/ov.cc libinterp/octave-value/ov.h libinterp/octave.cc libinterp/parse-tree/jit-typeinfo.cc libinterp/parse-tree/jit-typeinfo.h libinterp/parse-tree/lex.h libinterp/parse-tree/lex.ll libinterp/parse-tree/oct-lvalue.cc libinterp/parse-tree/oct-parse.yy libinterp/parse-tree/parse.h libinterp/parse-tree/pt-eval.cc libinterp/parse-tree/pt-eval.h libinterp/parse-tree/pt-jit.cc libinterp/parse-tree/pt-pr-code.cc libinterp/parse-tree/pt-tm-const.cc liboctave/array/Array.h liboctave/array/CMatrix.cc liboctave/array/DiagArray2.h liboctave/array/PermMatrix.h liboctave/array/Sparse.h liboctave/array/dMatrix.cc liboctave/array/fCMatrix.cc liboctave/array/fMatrix.cc liboctave/numeric/randpoisson.cc liboctave/numeric/sparse-chol.cc liboctave/system/file-ops.cc liboctave/system/lo-sysdep.cc liboctave/system/oct-env.cc liboctave/system/oct-time.cc liboctave/util/action-container.cc liboctave/util/action-container.h liboctave/util/cmd-edit.cc liboctave/util/cmd-hist.cc liboctave/util/data-conv.cc liboctave/util/file-info.h liboctave/util/lo-hash.h liboctave/util/lo-regexp.cc liboctave/util/oct-base64.cc liboctave/util/oct-base64.h liboctave/util/oct-glob.cc liboctave/util/oct-shlib.h liboctave/util/oct-sort.cc liboctave/util/oct-string.cc liboctave/util/unwind-prot.h liboctave/util/url-transfer.cc src/main.in.cc src/mkoctfile.in.cc src/shared-fcns.h
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/load-save.cc	Wed May 12 18:50:04 2021 +0200
+++ b/libinterp/corefcn/load-save.cc	Wed May 12 19:28:54 2021 +0200
@@ -906,9 +906,9 @@
   // format specified by FMT.
 
   std::size_t load_save_system::save_vars (std::ostream& os,
-                                      const std::string& pattern,
-                                      const load_save_format& fmt,
-                                      bool save_as_floats)
+                                           const std::string& pattern,
+                                           const load_save_format& fmt,
+                                           bool save_as_floats)
   {
     tree_evaluator& tw = m_interpreter.get_evaluator ();
 
@@ -996,10 +996,10 @@
   // in the format specified by FMT.
 
   std::size_t load_save_system::save_fields (std::ostream& os,
-                                        const octave_scalar_map& m,
-                                        const std::string& pattern,
-                                        const load_save_format& fmt,
-                                        bool save_as_floats)
+                                             const octave_scalar_map& m,
+                                             const std::string& pattern,
+                                             const load_save_format& fmt,
+                                             bool save_as_floats)
   {
     glob_match pat (pattern);