Mercurial > octave
diff libinterp/octave-value/ov-class.cc @ 26922:072d0610cc56
avoid some overloaded virtual warnings (bug #55741)
* ov.h (octave_value::xnumel (const octave_value_list&)):
Rename from numel. Change all uses.
* ov-base.h, ov-base.cc, ov-class.h, ov-class.cc, ov-classdef.h,
ov-classdef.cc: Rename "numel (const octave_value_list&) method to
xnumel. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 15 Mar 2019 07:16:27 +0000 |
| parents | bbc6b88aacc1 |
| children | bd684aad1821 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-class.cc Fri Mar 15 06:56:26 2019 +0000 +++ b/libinterp/octave-value/ov-class.cc Fri Mar 15 07:16:27 2019 +0000 @@ -332,10 +332,10 @@ } octave_idx_type -octave_class::numel (const octave_value_list& idx) +octave_class::xnumel (const octave_value_list& idx) { if (in_class_method () || called_from_builtin ()) - return octave_base_value::numel (idx); + return octave_base_value::xnumel (idx); octave_idx_type retval = -1; const std::string cn = class_name (); @@ -362,7 +362,7 @@ retval = lv(0).idx_type_value (true); } else - retval = octave_base_value::numel (idx); + retval = octave_base_value::xnumel (idx); return retval; } @@ -466,7 +466,7 @@ // Set up a proper nargout for the subsref call by calling numel. octave_value_list tmp; if (type[0] != '.') tmp = idx.front (); - true_nargout = numel (tmp); + true_nargout = xnumel (tmp); } retval = octave::feval (meth.function_value (), args, true_nargout);