diff libinterp/octave-value/ov-class.cc @ 15813:10d6ab9b1b4f

Implement octave_value function class_name() for class "octave_java" * libinterp/octave-value/ov-class.cc(Fclass): Remove special code for Java objects; Just call class_name() on octave_value object. * libinterp/octave-value/ov-java.h: Declare octave_value type functions. Rename confusing octave_java class private variable java_type to java_classname. * libinterp/octave-value/ov-java.cc: Replace tests for Java object from class_name() == "octave_java" to is_java().
author Rik <rik@octave.org>
date Tue, 18 Dec 2012 10:29:51 -0800
parents 83bf6fd9e46d
children e603ce23f20c
line wrap: on
line diff
--- a/libinterp/octave-value/ov-class.cc	Tue Dec 18 08:21:29 2012 -0800
+++ b/libinterp/octave-value/ov-class.cc	Tue Dec 18 10:29:51 2012 -0800
@@ -1942,15 +1942,7 @@
     print_usage ();
   else if (nargin == 1)
     // Called for class of object
-    if (! args(0).is_java ())
-      retval = args(0).class_name ();
-    else
-      {
-#ifdef HAVE_JAVA
-        octave_java *jobj = dynamic_cast<octave_java*>(args(0).internal_rep ());
-        retval = jobj->java_class_name ();
-#endif
-      }
+    retval = args(0).class_name ();
   else
     {
       // Called as class constructor