Mercurial > octave

diff libinterp/octave-value/ov-struct.cc @ 23587:0c468af9dc00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Deprecate is_object and replace with isobject. * ov.h (is_object): Use OCTAVE_DEPRECATED macro around function. * ov.h (isobject): New function. * bsxfun.cc, cellfun.cc, data.cc, ls-mat5.cc, oct-stream.cc, symtab.h, variables.cc, ov-base.h, ov-class.cc, ov-class.h, ov-classdef.h, ov-oncleanup.h, ov-struct.cc, ov.cc, ov.h, op-class.cc, pt-arg-list.cc, pt-eval.cc, pt-tm-const.cc: Replace instances of is_object with isobject.
author Rik <rik@octave.org>
date Tue, 13 Jun 2017 11:25:31 -0700
parents 7ed6b258db91
children 63950abd2f81
line wrap: on
line diff
--- a/libinterp/octave-value/ov-struct.cc	Tue Jun 13 10:20:55 2017 -0700
+++ b/libinterp/octave-value/ov-struct.cc	Tue Jun 13 11:25:31 2017 -0700
@@ -463,7 +463,7 @@
           }
         else
           {
-            if (t_rhs.isstruct () || t_rhs.is_object ())
+            if (t_rhs.isstruct () || t_rhs.isobject ())
               {
                 octave_map rhs_map = t_rhs.xmap_value ("invalid structure assignment");
 
@@ -1704,7 +1704,7 @@
   if (nargin == 1 && args(0).isstruct ())
     return ovl (args(0));
 
-  if (nargin == 1 && args(0).is_object ())
+  if (nargin == 1 && args(0).isobject ())
     return ovl (args(0).map_value ());
 
   if ((nargin == 1 || nargin == 2)