Mercurial > octave

diff libinterp/octave-value/ov.h @ 23590:eb3c7abad98f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ov.h: Directly call replacement functions from deprecated functions. * ov.h: For deprecated functions, directly call rep->replacement_function rather than calling replacement_function which could introduce another function call. * ov.h (is_zero_by_zero): Move function to be with the rest of the size-related functions.
author Rik <rik@octave.org>
date Tue, 13 Jun 2017 13:39:37 -0700
parents 63950abd2f81
children 7a97944f06e5
line wrap: on
line diff
--- a/libinterp/octave-value/ov.h	Tue Jun 13 13:05:19 2017 -0700
+++ b/libinterp/octave-value/ov.h	Tue Jun 13 13:39:37 2017 -0700
@@ -482,6 +482,10 @@
 
   bool all_zero_dims (void) const { return dims ().all_zero (); }
 
+  // Are the dimensions of this constant zero by zero?
+  bool is_zero_by_zero (void) const
+  { return (ndims () == 2 && rows () == 0 && columns () == 0); }
+
   octave_idx_type numel (void) const
   { return rep->numel (); }
 
@@ -544,7 +548,7 @@
 
   OCTAVE_DEPRECATED ("use 'iscellstr' instead")
   bool is_cellstr (void) const
-  { return iscellstr (); }
+  { return rep->iscellstr (); }
 
   bool is_real_scalar (void) const
   { return rep->is_real_scalar (); }
@@ -590,7 +594,7 @@
 
   OCTAVE_DEPRECATED ("use 'isstruct' instead")
   bool is_map (void) const
-  { return isstruct (); }
+  { return rep->isstruct (); }
 
   bool is_classdef_object (void) const
   { return rep->is_classdef_object (); }
@@ -600,14 +604,14 @@
 
   OCTAVE_DEPRECATED ("use 'isobject' instead")
   bool is_object (void) const
-  { return isobject (); }
+  { return rep->isobject (); }
 
   bool isjava (void) const
   { return rep->isjava (); }
 
   OCTAVE_DEPRECATED ("use 'isjava' instead")
   bool is_java (void) const
-  { return isjava (); }
+  { return rep->isjava (); }
 
   bool is_cs_list (void) const
   { return rep->is_cs_list (); }
@@ -733,11 +737,6 @@
 
   bool is_equal (const octave_value&) const;
 
-  // Are the dimensions of this constant zero by zero?
-
-  bool is_zero_by_zero (void) const
-  { return (ndims () == 2 && rows () == 0 && columns () == 0); }
-
   bool is_constant (void) const
   { return rep->is_constant (); }