changeset 20079:49df5054c02e

maint: Merge away accidental head.
author Rik <rik@octave.org>
date Tue, 07 Apr 2015 22:06:14 -0700
parents 302e48c2de5d (diff) dc1b0043c54f (current diff)
children ae12edf69bce
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.h	Mon Apr 06 11:17:00 2015 -0300
+++ b/libinterp/octave-value/ov-java.h	Tue Apr 07 22:06:14 2015 -0700
@@ -143,6 +143,10 @@
 
   bool is_defined (void) const { return true; }
 
+  // FIXME: Is a variable containing a java object an object?
+  //        Or should this be is_constant like a matrix?
+  bool is_object (void) const { return true; }
+
   bool is_map (void) const { return false; }
 
   bool is_java (void) const { return true; }