diff options
| author | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
| commit | e0441a5bfb29083a532307ba2b1fd6d6d13944ba (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/java/io | |
| parent | 15c151967dd1cde61b79d26374f608f63a29d411 (diff) | |
| download | gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.zip gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.gz gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.bz2 | |
Import GNU Classpath (classpath-0_97_2-release).
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
From-SVN: r137223
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/BufferedReader.h | 2 | ||||
| -rw-r--r-- | libjava/java/io/DataInputStream.h | 5 | ||||
| -rw-r--r-- | libjava/java/io/DataOutputStream.h | 9 | ||||
| -rw-r--r-- | libjava/java/io/PipedInputStream.h | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/libjava/java/io/BufferedReader.h b/libjava/java/io/BufferedReader.h index 66d7766..1104773 100644 --- a/libjava/java/io/BufferedReader.h +++ b/libjava/java/io/BufferedReader.h @@ -40,8 +40,6 @@ public: // actually package-private jint limit; jint markPos; static const jint DEFAULT_BUFFER_SIZE = 8192; -private: - ::java::lang::StringBuffer * sbuf; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/io/DataInputStream.h b/libjava/java/io/DataInputStream.h index a7b8459..12371ff 100644 --- a/libjava/java/io/DataInputStream.h +++ b/libjava/java/io/DataInputStream.h @@ -32,6 +32,11 @@ public: virtual jint readUnsignedShort(); virtual ::java::lang::String * readUTF(); static ::java::lang::String * readUTF(::java::io::DataInput *); +public: // actually package-private + virtual ::java::lang::String * readUTFLong(); +private: + static ::java::lang::String * readUTF(::java::io::DataInput *, jint); +public: virtual jint skipBytes(jint); public: // actually package-private static jboolean convertToBoolean(jint); diff --git a/libjava/java/io/DataOutputStream.h b/libjava/java/io/DataOutputStream.h index 0d89dca..aebd234 100644 --- a/libjava/java/io/DataOutputStream.h +++ b/libjava/java/io/DataOutputStream.h @@ -29,10 +29,15 @@ public: virtual void writeDouble(jdouble); virtual void writeBytes(::java::lang::String *); virtual void writeChars(::java::lang::String *); -private: - jint getUTFlength(::java::lang::String *, jint, jint); +public: // actually package-private + virtual jlong getUTFlength(::java::lang::String *, jint, jlong); public: virtual void writeUTF(::java::lang::String *); +public: // actually package-private + virtual void writeUTFShort(::java::lang::String *, jint); + virtual void writeUTFLong(::java::lang::String *, jlong); +private: + void writeUTFBytes(::java::lang::String *); public: // actually protected jint __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) written; private: diff --git a/libjava/java/io/PipedInputStream.h b/libjava/java/io/PipedInputStream.h index 9531667..4055fa4 100644 --- a/libjava/java/io/PipedInputStream.h +++ b/libjava/java/io/PipedInputStream.h @@ -15,7 +15,9 @@ class java::io::PipedInputStream : public ::java::io::InputStream public: PipedInputStream(); + PipedInputStream(jint); PipedInputStream(::java::io::PipedOutputStream *); + PipedInputStream(::java::io::PipedOutputStream *, jint); virtual void connect(::java::io::PipedOutputStream *); public: // actually protected virtual void receive(jint); |