diff options
| author | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-15 17:03:49 +0000 |
|---|---|---|
| committer | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-15 17:03:49 +0000 |
| commit | 1e5e88e66f071071c698ff0f323f11220e2050da (patch) | |
| tree | 2875edfd5cea011a2688f3491cb30ce1430fc6b0 /libjava/java | |
| parent | dc57fd654a8e224b4124f9d1bb2ba1bf3926b341 (diff) | |
| download | ppe42-gcc-1e5e88e66f071071c698ff0f323f11220e2050da.tar.gz ppe42-gcc-1e5e88e66f071071c698ff0f323f11220e2050da.zip | |
* gnu/java/net/PlainSocketImpl.h: Regenerate.
* gnu/classpath/jdwp/VMVirtualMachine.h: Same.
* gnu/classpath/jdwp/VMFrame.h: Same.
* java/net/Socket.h: Same.
* java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122006 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/net/Socket.h | 1 | ||||
| -rw-r--r-- | libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libjava/java/net/Socket.h b/libjava/java/net/Socket.h index 776d6fc473a..bb0bf38b000 100644 --- a/libjava/java/net/Socket.h +++ b/libjava/java/net/Socket.h @@ -91,7 +91,6 @@ public: public: // actually package-private static ::java::net::SocketImplFactory * factory; ::java::net::SocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) impl; - jboolean implCreated; jboolean bound; private: jboolean inputShutdown; diff --git a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h index cf49d7fce32..24daec69337 100644 --- a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h +++ b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h @@ -18,7 +18,7 @@ public: // actually package-private public: ::java::util::Iterator * iterator(); JArray< ::java::util::Map$Entry * > * target$toArray(); - JArray< ::java::util::Map$Entry * > * toArray(JArray< ::java::util::Map$Entry * > *); + JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *); JArray< ::java::lang::Object * > * toArray(); private: static const jlong serialVersionUID = 7854390611657943733LL; |
