summaryrefslogtreecommitdiffstats
path: root/libjava/java
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2003-05-13 10:25:00 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2003-05-13 10:25:00 +0000
commit7d442e2505d69ce6a7691a96c4f4fe23be552d46 (patch)
treee68d3d5d12ef21a52873cf5bf3040dda7428356c /libjava/java
parent8e2dc45759a8a549740954370f10c4973ee2aa52 (diff)
downloadppe42-gcc-7d442e2505d69ce6a7691a96c4f4fe23be552d46.tar.gz
ppe42-gcc-7d442e2505d69ce6a7691a96c4f4fe23be552d46.zip
2003-05-13 Michael Koch <konqueror@gmx.de>
* java/nio/channels/FileChannel.java (MapMode.m): Made it package-private to match JDK 1.4. * java/nio/charset/Charset.java (decode): Made it final to match JDK 1.4. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66756 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/nio/channels/FileChannel.java2
-rw-r--r--libjava/java/nio/charset/Charset.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/nio/channels/FileChannel.java b/libjava/java/nio/channels/FileChannel.java
index 3fa0f35843e..708a50c9a39 100644
--- a/libjava/java/nio/channels/FileChannel.java
+++ b/libjava/java/nio/channels/FileChannel.java
@@ -51,7 +51,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel
{
public static class MapMode
{
- public int m;
+ int m;
public static MapMode READ_ONLY = new MapMode(0);
public static MapMode READ_WRITE = new MapMode(1);
diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java
index 889267f302f..e0f27e6e697 100644
--- a/libjava/java/nio/charset/Charset.java
+++ b/libjava/java/nio/charset/Charset.java
@@ -235,7 +235,7 @@ public abstract class Charset implements Comparable
return encode (CharBuffer.wrap (str));
}
- public CharBuffer decode (ByteBuffer bb)
+ public final CharBuffer decode (ByteBuffer bb)
{
try
{
OpenPOWER on IntegriCloud