diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/gnu/gcj/RawData.java | 5 | ||||
| -rw-r--r-- | libjava/java/lang/Thread.java | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natThread.cc | 3 |
4 files changed, 12 insertions, 7 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a0ff267..556df01 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2000-05-18 Bryce McKinlay <bryce@albatross.co.nz> + + * java/lang/Thread.java: Declare `data' as Object, not RawData. + * java/lang/natThread.java (initialize_native): Cast `data' to + jobject. + * gnu/gcj/RawData.java: Clarify documentation. + 2000-05-15 Andrew Haley <aph@cygnus.com> * include/ppc-signal.h: New file. diff --git a/libjava/gnu/gcj/RawData.java b/libjava/gnu/gcj/RawData.java index aef75ba..341c82f 100644 --- a/libjava/gnu/gcj/RawData.java +++ b/libjava/gnu/gcj/RawData.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -8,7 +8,8 @@ details. */ package gnu.gcj; -/** A type uses to indicate pointers to non-Java data. */ +/** A type used to indicate special data used by native code that should not + be marked by the garbage collector. */ public final class RawData { diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java index a731b0a..0d11337 100644 --- a/libjava/java/lang/Thread.java +++ b/libjava/java/lang/Thread.java @@ -10,8 +10,6 @@ details. */ package java.lang; -import gnu.gcj.RawData; - /** * @author Tom Tromey <tromey@cygnus.com> * @date August 24, 1998 @@ -292,7 +290,7 @@ public class Thread implements Runnable private boolean startable_flag; // Our native data. - private RawData data; + private Object data; // Next thread number to assign. private static int nextThreadNumber = 0; diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc index 7a5e900..3fe4083 100644 --- a/libjava/java/lang/natThread.cc +++ b/libjava/java/lang/natThread.cc @@ -23,7 +23,6 @@ details. */ #include <java/lang/IllegalThreadStateException.h> #include <java/lang/InterruptedException.h> #include <java/lang/NullPointerException.h> -#include <gnu/gcj/RawData.h> #include <jni.h> @@ -62,7 +61,7 @@ java::lang::Thread::initialize_native (void) // own finalizer then we will need to reinitialize this structure at // any "interesting" point. natThread *nt = (natThread *) _Jv_AllocBytes (sizeof (natThread)); - data = reinterpret_cast<gnu::gcj::RawData *> (nt); + data = reinterpret_cast<jobject> (nt); _Jv_MutexInit (&nt->join_mutex); _Jv_CondInit (&nt->join_cond); _Jv_ThreadInitData (&nt->thread, this); |