octave: libinterp/octave-value/ov-base-scalar.h annotate

annotate libinterp/octave-value/ov-base-scalar.h @ 26916:9cd4b045fe3d

avoid some overloaded virtual warnings (bug #55741) * ov-base-diag.h, ov-base-mat.h, ov-base-scalar.h, ov-base-sparse.h, ov-base.h, ov-class.h, ov-classdef.h, ov-cs-list.h, ov-fcn-handle.h, ov-java.h, ov-lazy-idx.h, ov-perm.h, ov-range.h: Avoid overloaded virtual method warnings for classes derived from octave_base_value that partially overload the three virtual subsref methods by adding using declarations.

author	John W. Eaton <jwe@octave.org>
date	Fri, 15 Mar 2019 05:45:27 +0000
parents	bdcb5c1aaf4f
children	b442ec6dda5c

rev	line source
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	1 /*
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	3 Copyright (C) 1996-2019 John W. Eaton
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	4
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23588 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23588 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	16
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6376 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23588 diff changeset	19 <https://www.gnu.org/licenses/>.
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	20
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	21 */
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	22
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19697 diff changeset	23 #if ! defined (octave_ov_base_scalar_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17787 diff changeset	24 #define octave_ov_base_scalar_h 1
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	25
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	26 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	27
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	28 #include <cstdlib>
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	29
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	30 #include <iosfwd>
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	31 #include <string>
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	32
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	33 #include "lo-mappers.h"
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	34 #include "lo-utils.h"
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	35 #include "str-vec.h"
6376 0eac3484e8df [project @ 2007-03-02 02:18:37 by jwe] jwe parents: 5900 diff changeset	36 #include "MatrixType.h"
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	37
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	38 #include "ov-base.h"
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	39 #include "ov-typeinfo.h"
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	40
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	41 // Real scalar values.
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	42
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 20791 diff changeset	43 template <typename ST>
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	44 class
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	45 octave_base_scalar : public octave_base_value
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	46 {
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	47 public:
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	48
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	49 octave_base_scalar (void)
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11570 diff changeset	50 : octave_base_value (), scalar () { }
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	51
9686 5e433877634f don't store MatrixType with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	52 octave_base_scalar (const ST& s)
5e433877634f don't store MatrixType with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	53 : octave_base_value (), scalar (s) { }
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	54
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	55 octave_base_scalar (const octave_base_scalar& s)
9686 5e433877634f don't store MatrixType with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	56 : octave_base_value (), scalar (s.scalar) { }
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	57
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	58 ~octave_base_scalar (void) = default;
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	59
4759 364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4661 diff changeset	60 octave_value squeeze (void) const { return scalar; }
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4661 diff changeset	61
8458 d254a21e0120 reimplement full as method of octave_base_value Jaroslav Hajek <highegg@gmail.com> parents: 8307 diff changeset	62 octave_value full_value (void) const { return scalar; }
d254a21e0120 reimplement full as method of octave_base_value Jaroslav Hajek <highegg@gmail.com> parents: 8307 diff changeset	63
26916 9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26386 diff changeset	64 // We don't need to override all three forms of subsref. The using
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26386 diff changeset	65 // declaration will avoid warnings about partially-overloaded virtual
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26386 diff changeset	66 // functions.
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26386 diff changeset	67 using octave_base_value::subsref;
9cd4b045fe3d avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26386 diff changeset	68
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	69 octave_value subsref (const std::string& type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	70 const std::list<octave_value_list>& idx);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3775 diff changeset	71
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7620 diff changeset	72 octave_value_list subsref (const std::string& type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	73 const std::list<octave_value_list>& idx, int)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	74 { return subsref (type, idx); }
4271 be631c1720ea [project @ 2003-01-03 19:36:04 by jwe] jwe parents: 4247 diff changeset	75
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	76 octave_value subsasgn (const std::string& type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	77 const std::list<octave_value_list>& idx,
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	78 const octave_value& rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3775 diff changeset	79
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	80 bool is_constant (void) const { return true; }
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	81
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	82 bool is_defined (void) const { return true; }
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	83
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	84 dim_vector dims (void) const;
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4559 diff changeset	85
10653 ec5fa46e0e45 override ndims and numel for scalars and matrices Jaroslav Hajek <highegg@gmail.com> parents: 10545 diff changeset	86 octave_idx_type numel (void) const { return 1; }
ec5fa46e0e45 override ndims and numel for scalars and matrices Jaroslav Hajek <highegg@gmail.com> parents: 10545 diff changeset	87
ec5fa46e0e45 override ndims and numel for scalars and matrices Jaroslav Hajek <highegg@gmail.com> parents: 10545 diff changeset	88 int ndims (void) const { return 2; }
ec5fa46e0e45 override ndims and numel for scalars and matrices Jaroslav Hajek <highegg@gmail.com> parents: 10545 diff changeset	89
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	90 octave_idx_type nnz (void) const { return (scalar != ST () ? 1 : 0); }
5602 dfa2da0563e5 [project @ 2006-01-31 03:43:40 by jwe] jwe parents: 5307 diff changeset	91
10545 ffe28cdc6fe2 fix reshape() and permute() for scalars Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	92 octave_value permute (const Array<int>&, bool = false) const;
4875 e674c7111b88 [project @ 2004-04-22 18:12:31 by jwe] jwe parents: 4791 diff changeset	93
10545 ffe28cdc6fe2 fix reshape() and permute() for scalars Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	94 octave_value reshape (const dim_vector& new_dims) const;
8307 ec969f3b8955 Add scalar reshape method David Bateman <dbateman@free.fr> parents: 7651 diff changeset	95
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4759 diff changeset	96 size_t byte_size (void) const { return sizeof (ST); }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4759 diff changeset	97
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4875 diff changeset	98 octave_value all (int = 0) const { return (scalar != ST ()); }
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	99
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4875 diff changeset	100 octave_value any (int = 0) const { return (scalar != ST ()); }
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	101
10816 7fa044155982 fix diag() with complex scalars Jaroslav Hajek <highegg@gmail.com> parents: 10670 diff changeset	102 octave_value diag (octave_idx_type k = 0) const;
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7433 diff changeset	103
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14464 diff changeset	104 octave_value diag (octave_idx_type m, octave_idx_type n) const;
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14464 diff changeset	105
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	106 octave_value sort (octave_idx_type, sortmode) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	107 { return octave_value (scalar); }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	108 octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	109 sortmode) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	110 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	111 sidx.resize (dim_vector (1, 1));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	112 sidx(0) = 0;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	113 return octave_value (scalar);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	114 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	115
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23586 diff changeset	116 sortmode issorted (sortmode mode = UNSORTED) const
26386 bdcb5c1aaf4f ov-base-scalar.h: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	117 { return mode == UNSORTED ? ASCENDING : mode; }
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	118
8733 3ef774603887 rename all uses of sortrows_idx to sort_rows_idx John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	119 Array<octave_idx_type> sort_rows_idx (sortmode) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	120 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	121 return Array<octave_idx_type> (dim_vector (1, 1),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	122 static_cast<octave_idx_type> (0));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	123 }
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	124
8734 767ed8cc6634 rename internal issorted and issorted_rows functions to is_sorted and is_sorted_rows John W. Eaton <jwe@octave.org> parents: 8733 diff changeset	125 sortmode is_sorted_rows (sortmode mode = UNSORTED) const
26386 bdcb5c1aaf4f ov-base-scalar.h: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	126 { return mode == UNSORTED ? ASCENDING : mode; }
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	127
9686 5e433877634f don't store MatrixType with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	128 MatrixType matrix_type (void) const { return MatrixType::Diagonal; }
5e433877634f don't store MatrixType with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	129 MatrixType matrix_type (const MatrixType&) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	130 { return matrix_type (); }
6376 0eac3484e8df [project @ 2007-03-02 02:18:37 by jwe] jwe parents: 5900 diff changeset	131
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	132 bool is_scalar_type (void) const { return true; }
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	133
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23502 diff changeset	134 bool isnumeric (void) const { return true; }
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	135
8626 1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8458 diff changeset	136 bool is_true (void) const;
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	137
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 17870 diff changeset	138 void print (std::ostream& os, bool pr_as_read_syntax = false);
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	139
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	140 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	141
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	142 bool print_name_tag (std::ostream& os, const std::string& name) const;
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	143
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17822 diff changeset	144 void short_disp (std::ostream& os) const;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	145
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24668 diff changeset	146 float_display_format get_edit_display_format (void) const;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24668 diff changeset	147
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24643 diff changeset	148 std::string edit_display (const float_display_format& fmt,
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24643 diff changeset	149 octave_idx_type i, octave_idx_type j) const;
24643 78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	150
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5759 diff changeset	151 // Unsafe. This function exists to support the MEX interface.
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5759 diff changeset	152 // You should not use it anywhere else.
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	153 void * mex_get_data (void) const { return const_cast<ST *> (&scalar); }
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5759 diff changeset	154
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	155 const ST& scalar_ref (void) const { return scalar; }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	156
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	157 ST& scalar_ref (void) { return scalar; }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	158
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18416 diff changeset	159 octave_value fast_elem_extract (octave_idx_type n) const;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18416 diff changeset	160
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	161 bool fast_elem_insert_self (void *where, builtin_type_t btyp) const;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10653 diff changeset	162
3278 9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	163 protected:
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	164
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	165 // The value of this scalar.
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	166 ST scalar;
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	167 };
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	168
9c9f0c035309 [project @ 1999-10-12 06:03:49 by jwe] jwe parents: diff changeset	169 #endif

Mercurial > octave

annotate libinterp/octave-value/ov-base-scalar.h @ 26916:9cd4b045fe3d