From 2feccc205e3371b3fb3037e50567ca357f783390 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Mon, 15 Jan 2001 08:11:40 +0000 Subject: All files with updated copyright. 2001-01-07 Alexandre Petit-Bianco All files with updated copyright. * prims.cc (class _Jv_PrimClass): Removed. (init_prim_class): New function. (DECLARE_PRIM_TYPE): Rewritten. `java::lang::Class' replaces `_Jv_PrimClass' in primitive type declarations. Assign to the value returned by `init_prim_class.' * gcj/array.h: `java::lang::Class' replaces `_Jv_PrimClass' in primitive type declarations. (JvPrimClass): Cast to `jclass' removed. * java/lang/Class.h (Class): New constructor. (Class): New copy constructor. (initializePrim): New prototype. (_Jv_PrimClass): Field removed. * java/lang/Object.h (struct _JvObjectPrefix): New virtuals nacd_1 and nacd_2 (for compatibility with the new C++ ABI.) (class java::lang::Object): `finalize' moved up front. * java/lang/natClass.cc (isAssignableFrom): Turned outline. (isInstance): Likewise. (isInterface): Likewise, fixed indentation. (initializePrim): New function. (New C++ ABI compatibility patch: http://sources.redhat.com/ml/java-patches/2001-q1/msg00065.html) From-SVN: r39032 --- libjava/gcj/array.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/gcj') diff --git a/libjava/gcj/array.h b/libjava/gcj/array.h index 8d28085..db58ddf 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 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation This file is part of libgcj. @@ -60,10 +60,10 @@ typedef JArray *jfloatArray; typedef JArray *jdoubleArray; typedef JArray *jstringArray; -extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass, +extern java::lang::Class _Jv_byteClass, _Jv_shortClass, _Jv_intClass, _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass, _Jv_doubleClass, _Jv_voidClass; -#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class) +#define JvPrimClass(TYPE) (& _Jv_##TYPE##Class) extern "C" jobjectArray _Jv_NewObjectArray(jsize length, jclass, jobject init); extern "C" jobject _Jv_NewPrimArray (jclass eltype, jint count); -- cgit v1.1