From 1e5e88e66f071071c698ff0f323f11220e2050da Mon Sep 17 00:00:00 2001
From: daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 15 Feb 2007 17:03:49 +0000
Subject: 	* 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
---
 libjava/java/net/Socket.h                                            | 1 -
 libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'libjava/java')

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;
-- 
cgit v1.2.3