diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-26 07:05:32 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-26 07:05:32 +0000 |
| commit | 3139614a9394ccd14218e29799bc5c9db0a741b2 (patch) | |
| tree | 8bd00c51e350e8505bf5561673010a0008df7aba /libjava/defineclass.cc | |
| parent | 1a3e3dee0831ccde752a948958bf1fbff4197ba6 (diff) | |
| download | gcc-3139614a9394ccd14218e29799bc5c9db0a741b2.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40838 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/defineclass.cc')
| -rw-r--r-- | libjava/defineclass.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index 962b8355aff..c309394212e 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -1,6 +1,6 @@ // defineclass.cc - defining a class from .class format. -/* Copyright (C) 1999, 2000 Free Software Foundation +/* Copyright (C) 1999, 2000, 2001 Free Software Foundation This file is part of libgcj. @@ -1576,10 +1576,9 @@ _Jv_ClassNameSamePackage (_Jv_Utf8Const *name1, _Jv_Utf8Const *name2) static void throw_no_class_def_found_error (jstring msg) { - if (msg == 0) - JvThrow (new java::lang::NoClassDefFoundError); - else - JvThrow (new java::lang::NoClassDefFoundError (msg)); + throw (msg + ? new java::lang::NoClassDefFoundError (msg) + : new java::lang::NoClassDefFoundError); } static void @@ -1591,17 +1590,15 @@ throw_no_class_def_found_error (char *msg) static void throw_class_format_error (jstring msg) { - if (msg == 0) - JvThrow (new java::lang::ClassFormatError); - else - JvThrow (new java::lang::ClassFormatError (msg)); + throw (msg + ? new java::lang::ClassFormatError (msg) + : new java::lang::ClassFormatError); } static void throw_internal_error (char *msg) { - JvThrow - (new java::lang::InternalError (JvNewStringLatin1 (msg))); + throw new java::lang::InternalError (JvNewStringLatin1 (msg)); } static jfloat int_bits_to_float (jint value) @@ -1616,12 +1613,12 @@ static jdouble long_bits_to_double (jlong value) static void throw_incompatible_class_change_error (jstring msg) { - JvThrow (new java::lang::IncompatibleClassChangeError (msg)); + throw new java::lang::IncompatibleClassChangeError (msg); } static void throw_class_circularity_error (jstring msg) { - JvThrow (new java::lang::ClassCircularityError (msg)); + throw new java::lang::ClassCircularityError (msg); } #endif /* INTERPRETER */ |