diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-06 23:59:34 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-06 23:59:34 +0000 |
| commit | d84423e764a6d305d918f4bc68a89ef1db9b50c7 (patch) | |
| tree | f4e3bf1a6159e99781c0200027dcff5518d59b27 /libjava/java/nio | |
| parent | feb80442c09c0763ce5a184b78a54cf12c078cbe (diff) | |
| download | ppe42-gcc-d84423e764a6d305d918f4bc68a89ef1db9b50c7.tar.gz ppe42-gcc-d84423e764a6d305d918f4bc68a89ef1db9b50c7.zip | |
Checking in header files missed by earlier commit
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121672 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/nio')
| -rw-r--r-- | libjava/java/nio/charset/Charset.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/java/nio/charset/Charset.h b/libjava/java/nio/charset/Charset.h index 62e4f647d7c..a2f3b3ead16 100644 --- a/libjava/java/nio/charset/Charset.h +++ b/libjava/java/nio/charset/Charset.h @@ -62,10 +62,11 @@ public: virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *); virtual ::java::nio::ByteBuffer * encode(::java::lang::String *); virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *); - virtual jint compareTo(::java::lang::Object *); + virtual jint target$compareTo(::java::nio::charset::Charset *); virtual jint hashCode(); virtual jboolean equals(::java::lang::Object *); virtual ::java::lang::String * toString(); + virtual jint compareTo(::java::lang::Object *); private: ::java::nio::charset::CharsetEncoder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cachedEncoder; ::java::nio::charset::CharsetDecoder * cachedDecoder; |
