Mercurial > jwe > octave

diff libinterp/octave-value/ov-cell.cc @ 23575:e95738a119da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 73558a835b64
children 00e518162fda
line wrap: on
line diff
--- a/libinterp/octave-value/ov-cell.cc	Fri Jun 09 15:32:33 2017 -0400
+++ b/libinterp/octave-value/ov-cell.cc	Sun Jun 11 15:26:14 2017 -0700
@@ -403,14 +403,14 @@
 }
 
 bool
-octave_cell::is_cellstr (void) const
+octave_cell::iscellstr (void) const
 {
   bool retval;
   if (cellstr_cache.get ())
     retval = true;
   else
     {
-      retval = matrix.is_cellstr ();
+      retval = matrix.iscellstr ();
       // Allocate empty cache to mark that this is indeed a cellstr.
       if (retval)
         cellstr_cache.reset (new Array<std::string> ());
@@ -456,7 +456,7 @@
 {
   octave_value retval;
 
-  if (! is_cellstr ())
+  if (! iscellstr ())
     error ("sort: only cell arrays of character strings may be sorted");
 
   Array<std::string> tmp = cellstr_value ();
@@ -475,7 +475,7 @@
 {
   octave_value retval;
 
-  if (! is_cellstr ())
+  if (! iscellstr ())
     error ("sort: only cell arrays of character strings may be sorted");
 
   Array<std::string> tmp = cellstr_value ();
@@ -493,7 +493,7 @@
 {
   sortmode retval = UNSORTED;
 
-  if (! is_cellstr ())
+  if (! iscellstr ())
     error ("issorted: A is not a cell array of strings");
 
   Array<std::string> tmp = cellstr_value ();
@@ -508,7 +508,7 @@
 {
   Array<octave_idx_type> retval;
 
-  if (! is_cellstr ())
+  if (! iscellstr ())
     error ("sortrows: only cell arrays of character strings may be sorted");
 
   Array<std::string> tmp = cellstr_value ();
@@ -523,7 +523,7 @@
 {
   sortmode retval = UNSORTED;
 
-  if (! is_cellstr ())
+  if (! iscellstr ())
     error ("issorted: A is not a cell array of strings");
 
   Array<std::string> tmp = cellstr_value ();
@@ -612,7 +612,7 @@
 {
   Array<std::string> retval;
 
-  if (! is_cellstr ())
+  if (! iscellstr ())
     error ("invalid conversion from cell array to array of strings");
 
   if (cellstr_cache->is_empty ())
@@ -1275,7 +1275,7 @@
   if (args.length () != 1)
     print_usage ();
 
-  return ovl (args(0).is_cellstr ());
+  return ovl (args(0).iscellstr ());
 }
 
 DEFUN (cellstr, args, ,