comparison libinterp/octave-value/ov-base-mat.h @ 31771:21f9b34eb893

maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.
author Rik <rik@octave.org>
date Tue, 24 Jan 2023 17:19:44 -0800
parents 597f3ee61a48
children 8e6a9cf412c1
comparison
equal deleted inserted replaced
31770:1d1eff97670e 31771:21f9b34eb893
51 { 51 {
52 public: 52 public:
53 53
54 typedef MT object_type; 54 typedef MT object_type;
55 55
56 octave_base_matrix (void) 56 octave_base_matrix ()
57 : octave_base_value (), m_matrix (), m_typ (), m_idx_cache () { } 57 : octave_base_value (), m_matrix (), m_typ (), m_idx_cache () { }
58 58
59 octave_base_matrix (const MT& m, const MatrixType& t = MatrixType ()) 59 octave_base_matrix (const MT& m, const MatrixType& t = MatrixType ())
60 : octave_base_value (), m_matrix (m), 60 : octave_base_value (), m_matrix (m),
61 m_typ (t.is_known () ? new MatrixType (t) : nullptr), m_idx_cache () 61 m_typ (t.is_known () ? new MatrixType (t) : nullptr), m_idx_cache ()
69 m_typ (m.m_typ ? new MatrixType (*m.m_typ) : nullptr), 69 m_typ (m.m_typ ? new MatrixType (*m.m_typ) : nullptr),
70 m_idx_cache (m.m_idx_cache ? new octave::idx_vector (*m.m_idx_cache) 70 m_idx_cache (m.m_idx_cache ? new octave::idx_vector (*m.m_idx_cache)
71 : nullptr) 71 : nullptr)
72 { } 72 { }
73 73
74 ~octave_base_matrix (void) { clear_cached_info (); } 74 ~octave_base_matrix () { clear_cached_info (); }
75 75
76 std::size_t byte_size (void) const { return m_matrix.byte_size (); } 76 std::size_t byte_size () const { return m_matrix.byte_size (); }
77 77
78 octave_value squeeze (void) const { return MT (m_matrix.squeeze ()); } 78 octave_value squeeze () const { return MT (m_matrix.squeeze ()); }
79 79
80 octave_value full_value (void) const { return m_matrix; } 80 octave_value full_value () const { return m_matrix; }
81 81
82 void maybe_economize (void) { m_matrix.maybe_economize (); } 82 void maybe_economize () { m_matrix.maybe_economize (); }
83 83
84 // We don't need to override all three forms of subsref. The using 84 // We don't need to override all three forms of subsref. The using
85 // declaration will avoid warnings about partially-overloaded virtual 85 // declaration will avoid warnings about partially-overloaded virtual
86 // functions. 86 // functions.
87 using octave_base_value::subsref; 87 using octave_base_value::subsref;
112 OCTINTERP_API void 112 OCTINTERP_API void
113 assign (const octave_value_list& idx, typename MT::element_type rhs); 113 assign (const octave_value_list& idx, typename MT::element_type rhs);
114 114
115 OCTINTERP_API void delete_elements (const octave_value_list& idx); 115 OCTINTERP_API void delete_elements (const octave_value_list& idx);
116 116
117 dim_vector dims (void) const { return m_matrix.dims (); } 117 dim_vector dims () const { return m_matrix.dims (); }
118 118
119 octave_idx_type numel (void) const { return m_matrix.numel (); } 119 octave_idx_type numel () const { return m_matrix.numel (); }
120 120
121 int ndims (void) const { return m_matrix.ndims (); } 121 int ndims () const { return m_matrix.ndims (); }
122 122
123 octave_idx_type nnz (void) const { return m_matrix.nnz (); } 123 octave_idx_type nnz () const { return m_matrix.nnz (); }
124 124
125 octave_value reshape (const dim_vector& new_dims) const 125 octave_value reshape (const dim_vector& new_dims) const
126 { return MT (m_matrix.reshape (new_dims)); } 126 { return MT (m_matrix.reshape (new_dims)); }
127 127
128 octave_value permute (const Array<int>& vec, bool inv = false) const 128 octave_value permute (const Array<int>& vec, bool inv = false) const
131 octave_value resize (const dim_vector& dv, bool fill = false) const; 131 octave_value resize (const dim_vector& dv, bool fill = false) const;
132 132
133 octave_value all (int dim = 0) const { return m_matrix.all (dim); } 133 octave_value all (int dim = 0) const { return m_matrix.all (dim); }
134 octave_value any (int dim = 0) const { return m_matrix.any (dim); } 134 octave_value any (int dim = 0) const { return m_matrix.any (dim); }
135 135
136 MatrixType matrix_type (void) const { return m_typ ? *m_typ : MatrixType (); } 136 MatrixType matrix_type () const { return m_typ ? *m_typ : MatrixType (); }
137 MatrixType matrix_type (const MatrixType& _typ) const; 137 MatrixType matrix_type (const MatrixType& _typ) const;
138 138
139 octave_value diag (octave_idx_type k = 0) const 139 octave_value diag (octave_idx_type k = 0) const
140 { return octave_value (m_matrix.diag (k)); } 140 { return octave_value (m_matrix.diag (k)); }
141 141
155 { return m_matrix.sort_rows_idx (mode); } 155 { return m_matrix.sort_rows_idx (mode); }
156 156
157 sortmode is_sorted_rows (sortmode mode = UNSORTED) const 157 sortmode is_sorted_rows (sortmode mode = UNSORTED) const
158 { return m_matrix.is_sorted_rows (mode); } 158 { return m_matrix.is_sorted_rows (mode); }
159 159
160 bool is_matrix_type (void) const { return true; } 160 bool is_matrix_type () const { return true; }
161 161
162 bool isnumeric (void) const { return true; } 162 bool isnumeric () const { return true; }
163 163
164 bool is_defined (void) const { return true; } 164 bool is_defined () const { return true; }
165 165
166 bool is_constant (void) const { return true; } 166 bool is_constant () const { return true; }
167 167
168 OCTINTERP_API bool is_true (void) const; 168 OCTINTERP_API bool is_true () const;
169 169
170 OCTINTERP_API bool print_as_scalar (void) const; 170 OCTINTERP_API bool print_as_scalar () const;
171 171
172 OCTINTERP_API void print (std::ostream& os, bool pr_as_read_syntax = false); 172 OCTINTERP_API void print (std::ostream& os, bool pr_as_read_syntax = false);
173 173
174 OCTINTERP_API void 174 OCTINTERP_API void
175 print_info (std::ostream& os, const std::string& prefix) const; 175 print_info (std::ostream& os, const std::string& prefix) const;
176 176
177 OCTINTERP_API void short_disp (std::ostream& os) const; 177 OCTINTERP_API void short_disp (std::ostream& os) const;
178 178
179 OCTINTERP_API float_display_format get_edit_display_format (void) const; 179 OCTINTERP_API float_display_format get_edit_display_format () const;
180 180
181 OCTINTERP_API std::string 181 OCTINTERP_API std::string
182 edit_display (const float_display_format& fmt, 182 edit_display (const float_display_format& fmt,
183 octave_idx_type i, octave_idx_type j) const; 183 octave_idx_type i, octave_idx_type j) const;
184 184
185 MT& matrix_ref (void) 185 MT& matrix_ref ()
186 { 186 {
187 clear_cached_info (); 187 clear_cached_info ();
188 return m_matrix; 188 return m_matrix;
189 } 189 }
190 190
191 const MT& matrix_ref (void) const 191 const MT& matrix_ref () const
192 { 192 {
193 return m_matrix; 193 return m_matrix;
194 } 194 }
195 195
196 OCTINTERP_API octave_value 196 OCTINTERP_API octave_value
199 OCTINTERP_API bool 199 OCTINTERP_API bool
200 fast_elem_insert (octave_idx_type n, const octave_value& x); 200 fast_elem_insert (octave_idx_type n, const octave_value& x);
201 201
202 // This function exists to support the MEX interface. 202 // This function exists to support the MEX interface.
203 // You should not use it anywhere else. 203 // You should not use it anywhere else.
204 const void * mex_get_data (void) const { return m_matrix.data (); } 204 const void * mex_get_data () const { return m_matrix.data (); }
205 205
206 protected: 206 protected:
207 207
208 MT m_matrix; 208 MT m_matrix;
209 209
212 delete m_idx_cache; 212 delete m_idx_cache;
213 m_idx_cache = (idx ? new octave::idx_vector (idx) : nullptr); 213 m_idx_cache = (idx ? new octave::idx_vector (idx) : nullptr);
214 return idx; 214 return idx;
215 } 215 }
216 216
217 void clear_cached_info (void) const 217 void clear_cached_info () const
218 { 218 {
219 delete m_typ; m_typ = nullptr; 219 delete m_typ; m_typ = nullptr;
220 delete m_idx_cache; m_idx_cache = nullptr; 220 delete m_idx_cache; m_idx_cache = nullptr;
221 } 221 }
222 222