diff options
| author | Guilhem Lavaux <guilhem@kaffe.org> | 2005-08-03 13:12:58 +0000 |
|---|---|---|
| committer | Guilhem Lavaux <guilhem@kaffe.org> | 2005-08-03 13:12:58 +0000 |
| commit | 0008b2cd875b445caeaecc4bf269c4a030301eaf (patch) | |
| tree | 3379cb186ad85ecfb01b4a8c20e2c1faa0cca275 /java/nio | |
| parent | ec519f49cb01caf23c6a05585ca12e343a7b99c1 (diff) | |
| download | classpath-0008b2cd875b445caeaecc4bf269c4a030301eaf.tar.gz | |
2005-08-03 Guilhem Lavaux <guilhem@kaffe.org>
* gnu/classpath/Pointer.java,
gnu/classpath/Pointer32.java,
gnu/classpath/Pointer64.java,
gnu/classpath/RawData.java,
gnu/classpath/RawData32.java,
gnu/classpath/RawData64.java,
gnu/java/awt/peer/gtk/GtkImage.java,
gnu/java/nio/charset/iconv/IconvDecoder.java,
gnu/java/nio/charset/iconv/IconvEncoder.java,
java/nio/Buffer.java,
java/nio/DirectByteBufferImpl.java,
java/nio/MappedByteBufferImpl.java,
native/jni/classpath/jcl.c,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,
native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c,
native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c,
native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c,
native/jni/java-nio/java_nio_MappedByteBufferImpl.c,
native/jni/java-nio/java_nio_VMDirectByteBuffer.c,
vm/reference/java/nio/VMDirectByteBuffer.java: Renamed
references to gnu/classpath/RawData to gnu/classpath/Pointer.
Diffstat (limited to 'java/nio')
| -rw-r--r-- | java/nio/Buffer.java | 4 | ||||
| -rw-r--r-- | java/nio/DirectByteBufferImpl.java | 8 | ||||
| -rw-r--r-- | java/nio/MappedByteBufferImpl.java | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/java/nio/Buffer.java b/java/nio/Buffer.java index 47dabf29e..2c7e00dcb 100644 --- a/java/nio/Buffer.java +++ b/java/nio/Buffer.java @@ -38,7 +38,7 @@ exception statement from your version. */ package java.nio; -import gnu.classpath.RawData; +import gnu.classpath.Pointer; /** * @since 1.4 @@ -49,7 +49,7 @@ public abstract class Buffer int limit = 0; int pos = 0; int mark = -1; - RawData address; + Pointer address; /** * Creates a new Buffer. diff --git a/java/nio/DirectByteBufferImpl.java b/java/nio/DirectByteBufferImpl.java index 796a157b6..53bb668aa 100644 --- a/java/nio/DirectByteBufferImpl.java +++ b/java/nio/DirectByteBufferImpl.java @@ -38,7 +38,7 @@ exception statement from your version. */ package java.nio; -import gnu.classpath.RawData; +import gnu.classpath.Pointer; abstract class DirectByteBufferImpl extends ByteBuffer { @@ -59,7 +59,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer static final class ReadOnly extends DirectByteBufferImpl { - ReadOnly(Object owner, RawData address, + ReadOnly(Object owner, Pointer address, int capacity, int limit, int position) { @@ -89,7 +89,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer super(capacity); } - ReadWrite(Object owner, RawData address, + ReadWrite(Object owner, Pointer address, int capacity, int limit, int position) { @@ -109,7 +109,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer this.address = VMDirectByteBuffer.allocate(capacity); } - DirectByteBufferImpl(Object owner, RawData address, + DirectByteBufferImpl(Object owner, Pointer address, int capacity, int limit, int position) { diff --git a/java/nio/MappedByteBufferImpl.java b/java/nio/MappedByteBufferImpl.java index 1b075d875..a53040f57 100644 --- a/java/nio/MappedByteBufferImpl.java +++ b/java/nio/MappedByteBufferImpl.java @@ -38,7 +38,7 @@ exception statement from your version. */ package java.nio; -import gnu.classpath.RawData; +import gnu.classpath.Pointer; import java.io.IOException; @@ -48,12 +48,12 @@ final class MappedByteBufferImpl extends MappedByteBuffer /** Posix uses this for the pointer returned by mmap; * Win32 uses it for the pointer returned by MapViewOfFile. */ - public RawData implPtr; + public Pointer implPtr; /** Posix uses this for the actual length passed to mmap; * Win32 uses it for the pointer returned by CreateFileMapping. */ public long implLen; - public MappedByteBufferImpl(RawData address, int size, boolean readOnly) + public MappedByteBufferImpl(Pointer address, int size, boolean readOnly) throws IOException { super(size, size, 0, -1); |
