Mercurial > hg > octave-lojdl
changeset 15754:bf77f7f66bdf
register octave_java type at Octave startup
* ov.cc (install_types): Register octave_java type here.
* ov-java.cc (initialize_java): Not here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 08 Dec 2012 00:36:52 -0500 |
parents | 6e39fe7992d9 |
children | 3216dafbbd48 |
files | libinterp/octave-value/ov-java.cc libinterp/octave-value/ov.cc |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc +++ b/libinterp/octave-value/ov-java.cc @@ -1351,8 +1351,8 @@ JNIEnv *current_env = octave_java::thread_jni_env (); - octave_java::register_type (); command_editor::add_event_hook (java_event_hook); + octave_thread_ID = get_current_thread_ID (current_env); //printf ("octave thread ID=%ld\n", octave_thread_ID); }
--- a/libinterp/octave-value/ov.cc +++ b/libinterp/octave-value/ov.cc @@ -76,6 +76,7 @@ #include "ov-typeinfo.h" #include "ov-null-mat.h" #include "ov-lazy-idx.h" +#include "ov-java.h" #include "defun.h" #include "error.h" @@ -2754,6 +2755,7 @@ octave_null_sq_str::register_type (); octave_lazy_index::register_type (); octave_oncleanup::register_type (); + octave_java::register_type (); } DEFUN (sizeof, args, ,