# HG changeset patch # User Rik # Date 1356113918 28800 # Node ID abc9e5f3c6613fbd1017fb131f463efa01e39cd8 # Parent bc7a130bbdfbb1169502f65ae92174296deb5279 Return correct value for ischar() predicate test on octave_java objects. * libinterp/octave-value/ov-java.h(is_string): Rename is_string() to is_java_string. Leave only prototype in .h file. * libinterp/octave-value/ov-java.cc(is_java_string): Move code for is_string from ov-java.h to is_java_string in ov-java.cc. diff -r bc7a130bbdfb -r abc9e5f3c661 libinterp/octave-value/ov-java.cc --- a/libinterp/octave-value/ov-java.cc Thu Dec 20 14:54:12 2012 -0500 +++ b/libinterp/octave-value/ov-java.cc Fri Dec 21 10:18:38 2012 -0800 @@ -621,6 +621,20 @@ return retval; } +bool +octave_java::is_java_string (void) const +{ + JNIEnv *current_env = thread_jni_env (); + + if (current_env && java_object) + { + jclass_ref cls (current_env, current_env->FindClass ("java/lang/String")); + return current_env->IsInstanceOf (java_object, cls); + } + + return false; +} + static octave_value check_exception (JNIEnv* jni_env) { diff -r bc7a130bbdfb -r abc9e5f3c661 libinterp/octave-value/ov-java.h --- a/libinterp/octave-value/ov-java.h Thu Dec 20 14:54:12 2012 -0500 +++ b/libinterp/octave-value/ov-java.h Fri Dec 21 10:18:38 2012 -0800 @@ -183,18 +183,7 @@ octave_value convert_to_str_internal (bool pad, bool force, char type) const; - bool is_string (void) const - { - JNIEnv *current_env = thread_jni_env (); - - if (current_env && java_object) - { - jclass_ref cls (current_env, current_env->FindClass ("java/lang/String")); - return current_env->IsInstanceOf (java_object, cls); - } - - return false; - } + bool is_java_string (void) const; static JNIEnv* thread_jni_env (void);