diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-07 11:32:07 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-07 11:32:07 +0000 |
| commit | 2d95c02be6e1f4db30a38b0e9322df01445b132a (patch) | |
| tree | be94893c552db65c2384cd29222e07c02378c21c /libjava/java/nio/FloatViewBufferImpl.java | |
| parent | fbbb20675404f3928d783d6655e432fd05933828 (diff) | |
| download | gcc-2d95c02be6e1f4db30a38b0e9322df01445b132a.tar.gz | |
2005-01-07 Michael Koch <konqueror@gmx.de>
PR libgcj/18115
* java/nio/Buffer.java (address): New field.
* java/nio/DirectByteBufferImpl.java (address): Removed.
* java/nio/MappedByteBufferImpl.java (address): Likewise.
* java/nio/CharViewBufferImpl.java (CharViewBufferImpl):
Explicitly initialize Buffer.address if needed.
* java/nio/DoubleViewBufferImpl.java (DoubleViewBufferImpl): Likewise.
* java/nio/FloatViewBufferImpl.java (FloatViewBufferImpl): Likewise.
* java/nio/IntViewBufferImpl.java (IntViewBufferImpl): Likewise.
* java/nio/LongViewBufferImpl.java (LongViewBufferImpl): Likewise.
* java/nio/ShortViewBufferImpl.java (ShortViewBufferImpl): Likewise.
* jni.cc (_Jv_JNI_GetDirectBufferAddress): Don't assume buffer is a
DirectByteBufferImpl object.
(_Jv_JNI_GetDirectBufferCapacity): Likewise.
* testsuite/libjava.jni/directbuffer.c,
testsuite/libjava.jni/directbuffer.java,
testsuite/libjava.jni/directbuffer.out,
testsuite/libjava.jni/bytebuffer.c,
testsuite/libjava.jni/bytebuffer.java,
testsuite/libjava.jni/bytebuffer.out: New files.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@93046 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/nio/FloatViewBufferImpl.java')
| -rw-r--r-- | libjava/java/nio/FloatViewBufferImpl.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libjava/java/nio/FloatViewBufferImpl.java b/libjava/java/nio/FloatViewBufferImpl.java index 40b7339dd4e..3dd0736fb49 100644 --- a/libjava/java/nio/FloatViewBufferImpl.java +++ b/libjava/java/nio/FloatViewBufferImpl.java @@ -53,6 +53,8 @@ final class FloatViewBufferImpl extends FloatBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public FloatViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ final class FloatViewBufferImpl extends FloatBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** |