aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/lang/natObject.cc
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2001-03-25 23:05:32 -0800
committerRichard Henderson <rth@gcc.gnu.org>2001-03-25 23:05:32 -0800
commitb3208f56cbe28aabe191564dd27cf6d78bfe9fd5 (patch)
tree8bd00c51e350e8505bf5561673010a0008df7aba /libjava/java/lang/natObject.cc
parent56b8908481ae59ad65338b4d1249b040a057cc27 (diff)
downloadgcc-b3208f56cbe28aabe191564dd27cf6d78bfe9fd5.zip
gcc-b3208f56cbe28aabe191564dd27cf6d78bfe9fd5.tar.gz
gcc-b3208f56cbe28aabe191564dd27cf6d78bfe9fd5.tar.bz2
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
Diffstat (limited to 'libjava/java/lang/natObject.cc')
-rw-r--r--libjava/java/lang/natObject.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc
index 43201f6..3ea073b 100644
--- a/libjava/java/lang/natObject.cc
+++ b/libjava/java/lang/natObject.cc
@@ -1,6 +1,6 @@
// natObject.cc - Implementation of the Object class.
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
This file is part of libgcj.
@@ -90,7 +90,7 @@ java::lang::Object::clone (void)
else
{
if (! java::lang::Cloneable::class$.isAssignableFrom(klass))
- JvThrow (new CloneNotSupportedException);
+ throw new CloneNotSupportedException;
size = klass->size();
r = JvAllocObject (klass, size);
@@ -173,8 +173,8 @@ java::lang::Object::notify (void)
sync_init ();
_Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info;
if (__builtin_expect (_Jv_CondNotify (&si->condition, &si->mutex), false))
- JvThrow (new IllegalMonitorStateException(JvNewStringLatin1
- ("current thread not owner")));
+ throw new IllegalMonitorStateException(JvNewStringLatin1
+ ("current thread not owner"));
}
void
@@ -184,8 +184,8 @@ java::lang::Object::notifyAll (void)
sync_init ();
_Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info;
if (__builtin_expect (_Jv_CondNotifyAll (&si->condition, &si->mutex), false))
- JvThrow (new IllegalMonitorStateException(JvNewStringLatin1
- ("current thread not owner")));
+ throw new IllegalMonitorStateException(JvNewStringLatin1
+ ("current thread not owner"));
}
void
@@ -194,16 +194,16 @@ java::lang::Object::wait (jlong timeout, jint nanos)
if (__builtin_expect (INIT_NEEDED (this), false))
sync_init ();
if (__builtin_expect (timeout < 0 || nanos < 0 || nanos > 999999, false))
- JvThrow (new IllegalArgumentException);
+ throw new IllegalArgumentException;
_Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info;
switch (_Jv_CondWait (&si->condition, &si->mutex, timeout, nanos))
{
case _JV_NOT_OWNER:
- JvThrow (new IllegalMonitorStateException (JvNewStringLatin1
- ("current thread not owner")));
+ throw new IllegalMonitorStateException (JvNewStringLatin1
+ ("current thread not owner"));
case _JV_INTERRUPTED:
if (Thread::interrupted ())
- JvThrow (new InterruptedException);
+ throw new InterruptedException;
}
}
@@ -224,7 +224,7 @@ _Jv_MonitorEnter (jobject obj)
{
#ifndef HANDLE_SEGV
if (__builtin_expect (! obj, false))
- JvThrow (new java::lang::NullPointerException);
+ throw new java::lang::NullPointerException;
#endif
if (__builtin_expect (INIT_NEEDED (obj), false))
obj->sync_init ();
@@ -239,7 +239,7 @@ _Jv_MonitorExit (jobject obj)
JvAssert (! INIT_NEEDED (obj));
_Jv_SyncInfo *si = (_Jv_SyncInfo *) obj->sync_info;
if (__builtin_expect (_Jv_MutexUnlock (&si->mutex), false))
- JvThrow (new java::lang::IllegalMonitorStateException);
+ throw new java::lang::IllegalMonitorStateException;
return 0;
}