Mercurial > octave
diff libinterp/corefcn/strfns.cc @ 23575:e95738a119da
maint: Deprecate is_cellstr and replace with iscellstr.
* ov.h (is_cellstr): Use OCTAVE_DEPRECATED macro for is_cellstr.
* ov.h (iscellstr): New function.
* Cell.cc, Cell.h, data.cc, graphics.cc, graphics.in.h, lookup.cc, strfns.cc,
sysdep.cc, __delaunayn__.cc, __voronoi__.cc, convhulln.cc, ov-base.h,
ov-cell.cc, ov-cell.h, ov-java.cc, ov-struct.cc:
Replace occurrences of is_cellstr with iscellstr.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 11 Jun 2017 15:26:14 -0700 |
| parents | 21baad6b35c4 |
| children | 00e518162fda |
line wrap: on
line diff
--- a/libinterp/corefcn/strfns.cc Fri Jun 09 15:32:33 2017 -0400 +++ b/libinterp/corefcn/strfns.cc Sun Jun 11 15:26:14 2017 -0700 @@ -357,7 +357,7 @@ std::string s = (r == 0 ? "" : str[0]); - if (cell_val.is_cellstr ()) + if (cell_val.iscellstr ()) { const Array<std::string> cellstr = cell_val.cellstr_value (); for (octave_idx_type i = 0; i < cellstr.numel (); i++) @@ -402,7 +402,7 @@ if (cell.numel () == r) { - if (cell_val.is_cellstr ()) + if (cell_val.iscellstr ()) { const Array<std::string> cellstr = cell_val.cellstr_value (); @@ -463,7 +463,7 @@ { const std::string str2 = cell2(0).string_value (); - if (cell1_val.is_cellstr ()) + if (cell1_val.iscellstr ()) { const Array<std::string> cellstr = cell1_val.cellstr_value (); for (octave_idx_type i = 0; i < cellstr.numel (); i++) @@ -488,7 +488,7 @@ if (size1 != size2) error ("%s: nonconformant cell arrays", fcn_name); - if (cell1.is_cellstr () && cell2.is_cellstr ()) + if (cell1.iscellstr () && cell2.iscellstr ()) { const Array<std::string> cellstr1 = cell1_val.cellstr_value (); const Array<std::string> cellstr2 = cell2_val.cellstr_value ();