comparison libinterp/octave-value/ov-magic-int.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 dea87a95ad18
comparison
equal deleted inserted replaced
31770:1d1eff97670e 31771:21f9b34eb893
50 class 50 class
51 octave_base_magic_int : public octave_base_scalar<T> 51 octave_base_magic_int : public octave_base_scalar<T>
52 { 52 {
53 public: 53 public:
54 54
55 octave_base_magic_int (void) 55 octave_base_magic_int ()
56 : octave_base_scalar<T> (0) { } 56 : octave_base_scalar<T> (0) { }
57 57
58 octave_base_magic_int (const T& val) 58 octave_base_magic_int (const T& val)
59 : octave_base_scalar<T> (val) { } 59 : octave_base_scalar<T> (val) { }
60 60
61 ~octave_base_magic_int (void) = default; 61 ~octave_base_magic_int () = default;
62 62
63 // We return an octave_matrix here instead of an octave_scalar so 63 // We return an octave_matrix here instead of an octave_scalar so
64 // that in expressions like A(2,2,2) = 2 (for A previously 64 // that in expressions like A(2,2,2) = 2 (for A previously
65 // undefined), A will be empty instead of a 1x1 object. 65 // undefined), A will be empty instead of a 1x1 object.
66 octave_base_value * empty_clone (void) const { return new octave_matrix (); } 66 octave_base_value * empty_clone () const { return new octave_matrix (); }
67 67
68 // Although SCALAR is a protected member of the base class, it is not 68 // Although SCALAR is a protected member of the base class, it is not
69 // directly visible here without the explicit octave_base_slalar<T>:: 69 // directly visible here without the explicit octave_base_slalar<T>::
70 // qualification. Why not? 70 // qualification. Why not?
71 71
72 const T& scalar_ref (void) const { return octave_base_scalar<T>::scalar; } 72 const T& scalar_ref () const { return octave_base_scalar<T>::scalar; }
73 73
74 T& scalar_ref (void) { return octave_base_scalar<T>::scalar; } 74 T& scalar_ref () { return octave_base_scalar<T>::scalar; }
75 75
76 octave_value do_index_op (const octave_value_list& idx, 76 octave_value do_index_op (const octave_value_list& idx,
77 bool resize_ok = false); 77 bool resize_ok = false);
78 78
79 octave::idx_vector index_vector (bool require_integers = false) const; 79 octave::idx_vector index_vector (bool require_integers = false) const;
80 80
81 octave_value any (int = 0) const { return scalar_ref () != T (0); } 81 octave_value any (int = 0) const { return scalar_ref () != T (0); }
82 82
83 builtin_type_t builtin_type (void) const { return btyp_double; } 83 builtin_type_t builtin_type () const { return btyp_double; }
84 84
85 bool is_storable (void) const { return false; } 85 bool is_storable () const { return false; }
86 86
87 bool is_magic_int (void) const { return true; } 87 bool is_magic_int () const { return true; }
88 88
89 bool is_real_scalar (void) const { return true; } 89 bool is_real_scalar () const { return true; }
90 90
91 bool isreal (void) const { return true; } 91 bool isreal () const { return true; }
92 92
93 bool is_double_type (void) const { return true; } 93 bool is_double_type () const { return true; }
94 94
95 bool isfloat (void) const { return true; } 95 bool isfloat () const { return true; }
96 96
97 int8NDArray int8_array_value (void) const 97 int8NDArray int8_array_value () const
98 { return int8NDArray (dim_vector (1, 1), double_value ()); } 98 { return int8NDArray (dim_vector (1, 1), double_value ()); }
99 99
100 int16NDArray int16_array_value (void) const 100 int16NDArray int16_array_value () const
101 { return int16NDArray (dim_vector (1, 1), double_value ()); } 101 { return int16NDArray (dim_vector (1, 1), double_value ()); }
102 102
103 int32NDArray int32_array_value (void) const 103 int32NDArray int32_array_value () const
104 { return int32NDArray (dim_vector (1, 1), double_value ()); } 104 { return int32NDArray (dim_vector (1, 1), double_value ()); }
105 105
106 int64NDArray int64_array_value (void) const 106 int64NDArray int64_array_value () const
107 { return int64NDArray (dim_vector (1, 1), double_value ()); } 107 { return int64NDArray (dim_vector (1, 1), double_value ()); }
108 108
109 uint8NDArray uint8_array_value (void) const 109 uint8NDArray uint8_array_value () const
110 { return uint8NDArray (dim_vector (1, 1), double_value ()); } 110 { return uint8NDArray (dim_vector (1, 1), double_value ()); }
111 111
112 uint16NDArray uint16_array_value (void) const 112 uint16NDArray uint16_array_value () const
113 { return uint16NDArray (dim_vector (1, 1), double_value ()); } 113 { return uint16NDArray (dim_vector (1, 1), double_value ()); }
114 114
115 uint32NDArray uint32_array_value (void) const 115 uint32NDArray uint32_array_value () const
116 { return uint32NDArray (dim_vector (1, 1), double_value ()); } 116 { return uint32NDArray (dim_vector (1, 1), double_value ()); }
117 117
118 uint64NDArray uint64_array_value (void) const 118 uint64NDArray uint64_array_value () const
119 { return uint64NDArray (dim_vector (1, 1), double_value ()); } 119 { return uint64NDArray (dim_vector (1, 1), double_value ()); }
120 120
121 octave_int8 int8_scalar_value (void) const 121 octave_int8 int8_scalar_value () const
122 { return octave_int8 (double_value ()); } 122 { return octave_int8 (double_value ()); }
123 123
124 octave_int16 int16_scalar_value (void) const 124 octave_int16 int16_scalar_value () const
125 { return octave_int16 (double_value ()); } 125 { return octave_int16 (double_value ()); }
126 126
127 octave_int32 int32_scalar_value (void) const 127 octave_int32 int32_scalar_value () const
128 { return octave_int32 (double_value ()); } 128 { return octave_int32 (double_value ()); }
129 129
130 octave_int64 int64_scalar_value (void) const 130 octave_int64 int64_scalar_value () const
131 { return octave_int64 (double_value ()); } 131 { return octave_int64 (double_value ()); }
132 132
133 octave_uint8 uint8_scalar_value (void) const 133 octave_uint8 uint8_scalar_value () const
134 { return octave_uint8 (double_value ()); } 134 { return octave_uint8 (double_value ()); }
135 135
136 octave_uint16 uint16_scalar_value (void) const 136 octave_uint16 uint16_scalar_value () const
137 { return octave_uint16 (double_value ()); } 137 { return octave_uint16 (double_value ()); }
138 138
139 octave_uint32 uint32_scalar_value (void) const 139 octave_uint32 uint32_scalar_value () const
140 { return octave_uint32 (double_value ()); } 140 { return octave_uint32 (double_value ()); }
141 141
142 octave_uint64 uint64_scalar_value (void) const 142 octave_uint64 uint64_scalar_value () const
143 { return octave_uint64 (double_value ()); } 143 { return octave_uint64 (double_value ()); }
144 144
145 double double_value (bool = false) const 145 double double_value (bool = false) const
146 { 146 {
147 return scalar_ref ().double_value (); 147 return scalar_ref ().double_value ();
219 warn_logical_conversion (); 219 warn_logical_conversion ();
220 220
221 return boolNDArray (dim_vector (1, 1), double_value ()); 221 return boolNDArray (dim_vector (1, 1), double_value ());
222 } 222 }
223 223
224 octave_value as_double (void) const; 224 octave_value as_double () const;
225 octave_value as_single (void) const; 225 octave_value as_single () const;
226 226
227 octave_value as_int8 (void) const; 227 octave_value as_int8 () const;
228 octave_value as_int16 (void) const; 228 octave_value as_int16 () const;
229 octave_value as_int32 (void) const; 229 octave_value as_int32 () const;
230 octave_value as_int64 (void) const; 230 octave_value as_int64 () const;
231 231
232 octave_value as_uint8 (void) const; 232 octave_value as_uint8 () const;
233 octave_value as_uint16 (void) const; 233 octave_value as_uint16 () const;
234 octave_value as_uint32 (void) const; 234 octave_value as_uint32 () const;
235 octave_value as_uint64 (void) const; 235 octave_value as_uint64 () const;
236 236
237 // We don't need to override both forms of the diag method. The using 237 // We don't need to override both forms of the diag method. The using
238 // declaration will avoid warnings about partially-overloaded virtual 238 // declaration will avoid warnings about partially-overloaded virtual
239 // functions. 239 // functions.
240 using octave_base_scalar<T>::diag; 240 using octave_base_scalar<T>::diag;
241 241
242 octave_value diag (octave_idx_type m, octave_idx_type n) const; 242 octave_value diag (octave_idx_type m, octave_idx_type n) const;
243 243
244 octave_value convert_to_str_internal (bool pad, bool force, char type) const; 244 octave_value convert_to_str_internal (bool pad, bool force, char type) const;
245 245
246 void increment (void) { scalar_ref () += T (1); } 246 void increment () { scalar_ref () += T (1); }
247 247
248 void decrement (void) { scalar_ref () -= T (1); } 248 void decrement () { scalar_ref () -= T (1); }
249 249
250 bool save_ascii (std::ostream& os); 250 bool save_ascii (std::ostream& os);
251 251
252 bool load_ascii (std::istream& is); 252 bool load_ascii (std::istream& is);
253 253
277 OCTINTERP_API 277 OCTINTERP_API
278 octave_magic_uint : public octave_base_magic_int<octave_uint64> 278 octave_magic_uint : public octave_base_magic_int<octave_uint64>
279 { 279 {
280 public: 280 public:
281 281
282 octave_magic_uint (void) 282 octave_magic_uint ()
283 : octave_base_magic_int<octave_uint64> (0) { } 283 : octave_base_magic_int<octave_uint64> (0) { }
284 284
285 octave_magic_uint (const octave_uint64& val) 285 octave_magic_uint (const octave_uint64& val)
286 : octave_base_magic_int<octave_uint64> (val) { } 286 : octave_base_magic_int<octave_uint64> (val) { }
287 287
288 ~octave_magic_uint (void) = default; 288 ~octave_magic_uint () = default;
289 289
290 octave_base_value * clone (void) const 290 octave_base_value * clone () const
291 { 291 {
292 return new octave_magic_uint (*this); 292 return new octave_magic_uint (*this);
293 } 293 }
294 294
295 type_conv_info numeric_conversion_function (void) const; 295 type_conv_info numeric_conversion_function () const;
296 296
297 private: 297 private:
298 298
299 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA 299 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
300 }; 300 };
303 OCTINTERP_API 303 OCTINTERP_API
304 octave_magic_int : public octave_base_magic_int<octave_int64> 304 octave_magic_int : public octave_base_magic_int<octave_int64>
305 { 305 {
306 public: 306 public:
307 307
308 octave_magic_int (void) 308 octave_magic_int ()
309 : octave_base_magic_int<octave_int64> (0) { } 309 : octave_base_magic_int<octave_int64> (0) { }
310 310
311 octave_magic_int (const octave_int64& val) 311 octave_magic_int (const octave_int64& val)
312 : octave_base_magic_int<octave_int64> (val) { } 312 : octave_base_magic_int<octave_int64> (val) { }
313 313
314 ~octave_magic_int (void) = default; 314 ~octave_magic_int () = default;
315 315
316 octave_base_value * clone (void) const 316 octave_base_value * clone () const
317 { 317 {
318 return new octave_magic_int (*this); 318 return new octave_magic_int (*this);
319 } 319 }
320 320
321 type_conv_info numeric_conversion_function (void) const; 321 type_conv_info numeric_conversion_function () const;
322 322
323 private: 323 private:
324 324
325 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA 325 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
326 }; 326 };