From 3139614a9394ccd14218e29799bc5c9db0a741b2 Mon Sep 17 00:00:00 2001 From: rth Date: Mon, 26 Mar 2001 07:05:32 +0000 Subject: * 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 --- libjava/gnu/gcj/xlib/natDrawable.cc | 2 +- libjava/gnu/gcj/xlib/natFont.cc | 2 +- libjava/gnu/gcj/xlib/natWMSizeHints.cc | 2 +- libjava/gnu/gcj/xlib/natWindowAttributes.cc | 2 +- libjava/gnu/gcj/xlib/natXImage.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libjava/gnu/gcj/xlib') diff --git a/libjava/gnu/gcj/xlib/natDrawable.cc b/libjava/gnu/gcj/xlib/natDrawable.cc index c6e253a549b..6cca3b74901 100644 --- a/libjava/gnu/gcj/xlib/natDrawable.cc +++ b/libjava/gnu/gcj/xlib/natDrawable.cc @@ -59,7 +59,7 @@ gnu::gcj::xlib::Drawable::getBounds(java::awt::Rectangle* rv) switch (status) { case BadDrawable: - JvThrow(new XException(display, status)); + throw new XException(display, status); default: ; // All OK, NOP. } diff --git a/libjava/gnu/gcj/xlib/natFont.cc b/libjava/gnu/gcj/xlib/natFont.cc index 7e6b3f709c3..7bfea7b17f8 100644 --- a/libjava/gnu/gcj/xlib/natFont.cc +++ b/libjava/gnu/gcj/xlib/natFont.cc @@ -29,7 +29,7 @@ gnu::gcj::RawData* gnu::gcj::xlib::Font::loadFont(Display* display, XFontStruct* fontStruct = XLoadQueryFont(dpy, cName); if (fontStruct == 0) { - JvThrow(new XException(JvNewStringLatin1("font not found"))); + throw new XException(JvNewStringLatin1("font not found")); } return reinterpret_cast(fontStruct); diff --git a/libjava/gnu/gcj/xlib/natWMSizeHints.cc b/libjava/gnu/gcj/xlib/natWMSizeHints.cc index f38ea387fa3..0724a5a0925 100644 --- a/libjava/gnu/gcj/xlib/natWMSizeHints.cc +++ b/libjava/gnu/gcj/xlib/natWMSizeHints.cc @@ -23,7 +23,7 @@ void gnu::gcj::xlib::WMSizeHints::init(WMSizeHints* copyFrom) if (hints == 0) { jstring errorMessage = JvNewStringLatin1("XAllocSizeHints failed"); - JvThrow(new java::lang::OutOfMemoryError(errorMessage)); + throw new java::lang::OutOfMemoryError(errorMessage); } if (copyFrom != 0) diff --git a/libjava/gnu/gcj/xlib/natWindowAttributes.cc b/libjava/gnu/gcj/xlib/natWindowAttributes.cc index 5281acbab52..b6193481807 100644 --- a/libjava/gnu/gcj/xlib/natWindowAttributes.cc +++ b/libjava/gnu/gcj/xlib/natWindowAttributes.cc @@ -31,7 +31,7 @@ void gnu::gcj::xlib::WindowAttributes::initFromWindow(Window* from) Status status = XGetWindowAttributes(dpy, win, attributesIn); if ((status == BadDrawable) | (status == BadWindow)) - JvThrow(new XException(display, status)); + throw new XException(display, status); } diff --git a/libjava/gnu/gcj/xlib/natXImage.cc b/libjava/gnu/gcj/xlib/natXImage.cc index a527e8e665b..a92cf9f8c6f 100644 --- a/libjava/gnu/gcj/xlib/natXImage.cc +++ b/libjava/gnu/gcj/xlib/natXImage.cc @@ -40,7 +40,7 @@ void gnu::gcj::xlib::XImage::init(Visual* visual, jint depth, if (ximage == 0) { jstring errorMessage = JvNewStringLatin1("XCreateImage failed"); - JvThrow(new java::lang::OutOfMemoryError(errorMessage)); + throw new java::lang::OutOfMemoryError(errorMessage); } bool reinitialize = false; -- cgit v1.2.3