From b3208f56cbe28aabe191564dd27cf6d78bfe9fd5 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 25 Mar 2001 23:05:32 -0800 Subject: exception.cc (java_eh_info): Make value type jthrowable. * exception.cc (java_eh_info): Make value type jthrowable. (_Jv_type_matcher): Remove now unneeded cast. (_Jv_Throw): Make argument type jthrowable. Munge name for SJLJ_EXCEPTIONS here ... * gcj/cni.h: ... not here. (JvThrow): Remove. * gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations. * defineclass.cc, interpret.cc, jni.cc, posix-threads.cc, prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc, gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc, gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc, gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc, java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc, java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc, java/lang/natClass.cc, java/lang/natClassLoader.cc, java/lang/natDouble.cc, java/lang/natObject.cc, java/lang/natPosixProcess.cc, java/lang/natRuntime.cc, java/lang/natString.cc, java/lang/natSystem.cc, java/lang/natThread.cc, java/lang/reflect/natArray.cc, java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc, java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc, java/util/zip/natInflater.cc: Use throw, not JvThrow or _Jv_Throw. From-SVN: r40838 --- libjava/java/util/zip/natDeflater.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libjava/java/util/zip/natDeflater.cc') diff --git a/libjava/java/util/zip/natDeflater.cc b/libjava/java/util/zip/natDeflater.cc index 8ef6cf6..934d870 100644 --- a/libjava/java/util/zip/natDeflater.cc +++ b/libjava/java/util/zip/natDeflater.cc @@ -37,9 +37,9 @@ java::util::zip::Deflater::deflate (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; if (len == 0) return 0; @@ -58,7 +58,7 @@ java::util::zip::Deflater::deflate (jbyteArray buf, jint off, jint len) case Z_STREAM_ERROR: case Z_BUF_ERROR: // FIXME? - _Jv_Throw (new java::lang::InternalError); + throw new java::lang::InternalError; break; case Z_OK: @@ -134,9 +134,9 @@ java::util::zip::Deflater::setDictionary (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; // Ignore errors. deflateSetDictionary (s, (Bytef *) (elements (buf) + off), len); @@ -149,9 +149,9 @@ java::util::zip::Deflater::setInput (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; s->next_in = (Bytef *) (elements (buf) + off); s->avail_in = len; @@ -205,7 +205,7 @@ java::util::zip::Deflater::init (jint level, jboolean no_header) jstring msg = NULL; if (stream->msg != NULL) msg = JvNewStringLatin1 (stream->msg); - _Jv_Throw (new java::lang::InternalError (msg)); + throw new java::lang::InternalError (msg); } zstream = reinterpret_cast (stream); -- cgit v1.1