diff options
author | Mark Mitchell <mark@codesourcery.com> | 2002-12-28 06:38:52 +0000 |
---|---|---|
committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-12-28 06:38:52 +0000 |
commit | dfe5a36e9576498d7aa9555e138b21f6ba9ee214 (patch) | |
tree | bba7de0c691d951ea3bfa44719a322941f969d38 /libjava/gcj | |
parent | 239b7deaef30a58050dca4a69ca8ef34ae3f2194 (diff) | |
download | gcc-dfe5a36e9576498d7aa9555e138b21f6ba9ee214.zip gcc-dfe5a36e9576498d7aa9555e138b21f6ba9ee214.tar.gz gcc-dfe5a36e9576498d7aa9555e138b21f6ba9ee214.tar.bz2 |
boehm.cc: Remove stray semicolon.
* boehm.cc: Remove stray semicolon.
* interpret.cc: Likewise.
* prims.cc: Likewise.
* verify.cc (_Jv_BytecodeVerifier::verify_fail): Move definition
earlier to ensure default arguments are processed.
* gcj/array.h (JArray): Add forward declaration.
(elements): Likewise.
* gcj/javaprim.h: Remove stray semicolons.
* include/bohm-gc.h: Likewise.
* include/jni.h: Likewise.
* include/jvm.h: Likewise.
* java/lang/Class.h (_Jv_GetArrayClass): Declare _Jv_NewArrayClass.
From-SVN: r60556
Diffstat (limited to 'libjava/gcj')
-rw-r--r-- | libjava/gcj/array.h | 12 | ||||
-rw-r--r-- | libjava/gcj/javaprims.h | 18 |
2 files changed, 19 insertions, 11 deletions
diff --git a/libjava/gcj/array.h b/libjava/gcj/array.h index db58ddf..33ea038 100644 --- a/libjava/gcj/array.h +++ b/libjava/gcj/array.h @@ -1,6 +1,6 @@ // array.h - Header file for CNI arrays. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation This file is part of libgcj. @@ -30,6 +30,14 @@ public: }; template<class T> +class JArray; + +template<class T> +inline T* elements(JArray<T>& x); +template<class T> +inline T* elements(JArray<T>* x); + +template<class T> class JArray : public __JArray { T data[0]; @@ -45,7 +53,7 @@ inline T* elements(JArray<T>& x) { return x.data; } template<class T> inline T* elements(JArray<T>* x) { return x->data; } -}; // end extern "Java" +} // end extern "Java" /* These typesdefs match those in JNI. */ typedef __JArray *jarray; diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index 8ed6494..c6e4a00 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -123,7 +123,7 @@ extern "Java" class ValidatorAndPriority; class WriteAbortedException; class Writer; - }; + } namespace lang { @@ -222,7 +222,7 @@ extern "Java" class ReferenceQueue; class SoftReference; class WeakReference; - }; + } namespace reflect { @@ -240,8 +240,8 @@ extern "Java" class Proxy$ProxyType; class ReflectPermission; class UndeclaredThrowableException; - }; - }; + } + } namespace util { @@ -369,7 +369,7 @@ extern "Java" class JarInputStream; class JarOutputStream; class Manifest; - }; + } namespace zip { @@ -393,10 +393,10 @@ extern "Java" class ZipFile$ZipEntryEnumeration; class ZipInputStream; class ZipOutputStream; - }; - }; - }; -}; + } + } + } +} typedef struct java::lang::Object* jobject; typedef class java::lang::Class* jclass; |