libjava/classpath

	* java/util/Collections.java (UnmodifiableMap.toArray): Imported
	changes from Classpath.
libjava
	* sources.am, Makefile.in: Rebuilt.
	* java/lang/Socket.java: Removed override.
	* java/lang/DatagramSocket.java: Removed override.
	* gnu/java/net/PlainSocketImpl.java (localSocketAddress): New
	field.
	(getLocalAddress): New method.
	* gnu/java/net/PlainDatagramSocketImpl.java
	(PlainDatagramSocketImpl): Throws IOException.
	* gnu/java/net/natPlainSocketImplPosix.cc (write): Remove
	'sizeof'.
	(read): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121866 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 12 insertions, 7 deletions

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 336813b7f4c..e50d8f79747 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2007-02-12  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/Collections.java (UnmodifiableMap.toArray): Imported
+	changes from Classpath.
+
 2007-02-09  Gary Benson  <gbenson@redhat.com>
 
 	* javax/management/ObjectName.java
diff --git a/libjava/classpath/java/util/Collections.java b/libjava/classpath/java/util/Collections.java
index c15fa092bb2..77ff6ed8fa0 100644
--- a/libjava/classpath/java/util/Collections.java
+++ b/libjava/classpath/java/util/Collections.java
@@ -5115,7 +5115,7 @@ public class Collections
       // Map.Entry
       public Map.Entry<K,V>[] toArray()
       {
-        Map.Entry<K,V>[] mapEntryResult = (Map.Entry<K,V>[]) super.toArray();
+        Object[] mapEntryResult = super.toArray();
         UnmodifiableMapEntry<K,V> result[] = null;
   
         if (mapEntryResult != null)
@@ -5123,21 +5123,21 @@ public class Collections
             result = (UnmodifiableMapEntry<K,V>[])
 	      new UnmodifiableMapEntry[mapEntryResult.length];
             for (int i = 0; i < mapEntryResult.length; ++i)
-	      result[i] = new UnmodifiableMapEntry(mapEntryResult[i]);
+	      result[i] = new UnmodifiableMapEntry<K,V>((Map.Entry<K,V>)mapEntryResult[i]);
 	  }
         return result;
       }
   
       // The array returned is an array of UnmodifiableMapEntry instead of
       // Map.Entry
-      public Map.Entry<K,V>[] toArray(Map.Entry<K,V>[] array)
+      public <S> S[] toArray(S[] array)
       {
-        super.toArray(array);
+        S[] result = super.toArray(array);
   
-        if (array != null)
-	  for (int i = 0; i < array.length; i++)
+        if (result != null)
+	  for (int i = 0; i < result.length; i++)
 	    array[i] =
-	      new UnmodifiableMapEntry<K,V>(array[i]);
+	      (S) new UnmodifiableMapEntry<K,V>((Map.Entry<K,V>) result[i]);
         return array;
       }
       
diff --git a/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class b/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class
index 376931bdd68..7ff9c0ca839 100644
--- a/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class
+++ b/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class
index c03ad3228a8..5c42da8e08a 100644
--- a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class
+++ b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class
index 4b93b302f00..739340fd585 100644
--- a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class
+++ b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class
index 7b9e3e8b878..1e26dd573b3 100644
--- a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class
+++ b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class
diff --git a/libjava/classpath/lib/java/net/DatagramSocket.class b/libjava/classpath/lib/java/net/DatagramSocket.class
index 033684ec72f..d80af7d4005 100644
--- a/libjava/classpath/lib/java/net/DatagramSocket.class
+++ b/libjava/classpath/lib/java/net/DatagramSocket.class
diff --git a/libjava/classpath/lib/java/net/Socket.class b/libjava/classpath/lib/java/net/Socket.class
index d833b437ef6..b4bb5c0c8b2 100644
--- a/libjava/classpath/lib/java/net/Socket.class
+++ b/libjava/classpath/lib/java/net/Socket.class
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class
index 4b9f103aecf..70357f7569b 100644
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class
+++ b/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class