Mercurial > octave

comparison libinterp/octave-value/ov.cc @ 21379:93c489ca8a6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
elimnate HAVE_JAVA from ov-java.h * ov-class.cc: Don't inlcude ov-java.h. * ov.cc: Include ov-java.h unconditionally. (install_types): Call octave_java::register_type unconditionally. * ov-java.h: Don't include <jni.h>. Eliminate HAVE_JAVA conditional. (class java_local_ref): Move definition and typedefs to ov-java.cc. (jstring_to_string, jstring_to_string, box, box_more, unbox): Delete declarations. Make definitions static in ov-java.cc. * ov-java.h, ov-java.cc: Use void pointers instead of specific Java types. (octave_java::thread_jni_env): Convert to non-class static function in ov-java.cc. (octave_java::octave_java): Throw error if Java is not available. In all other class methods, call panic_impossible if Java is not available.
author John W. Eaton <jwe@octave.org>
date Tue, 01 Mar 2016 00:59:50 -0500
parents 06d15e4e611a
children ae4d7dfea337
comparison
equal deleted inserted replaced
21378:172479a97e6c 21379:93c489ca8a6b
75 #include "ov-fcn-handle.h" 75 #include "ov-fcn-handle.h"
76 #include "ov-fcn-inline.h" 76 #include "ov-fcn-inline.h"
77 #include "ov-typeinfo.h" 77 #include "ov-typeinfo.h"
78 #include "ov-null-mat.h" 78 #include "ov-null-mat.h"
79 #include "ov-lazy-idx.h" 79 #include "ov-lazy-idx.h"
80 #ifdef HAVE_JAVA 80 #include "ov-java.h"
81 # include "ov-java.h"
82 #endif
83 81
84 #include "defun.h" 82 #include "defun.h"
85 #include "error.h" 83 #include "error.h"
86 #include "errwarn.h" 84 #include "errwarn.h"
87 #include "pager.h" 85 #include "pager.h"
2702 octave_null_matrix::register_type (); 2700 octave_null_matrix::register_type ();
2703 octave_null_str::register_type (); 2701 octave_null_str::register_type ();
2704 octave_null_sq_str::register_type (); 2702 octave_null_sq_str::register_type ();
2705 octave_lazy_index::register_type (); 2703 octave_lazy_index::register_type ();
2706 octave_oncleanup::register_type (); 2704 octave_oncleanup::register_type ();
2707 #ifdef HAVE_JAVA
2708 octave_java::register_type (); 2705 octave_java::register_type ();
2709 #endif
2710 } 2706 }
2711 2707
2712 DEFUN (sizeof, args, , 2708 DEFUN (sizeof, args, ,
2713 "-*- texinfo -*-\n\ 2709 "-*- texinfo -*-\n\
2714 @deftypefn {} {} sizeof (@var{val})\n\ 2710 @deftypefn {} {} sizeof (@var{val})\n\