From 65bf3316cf384588453604be6b4f0ed3751a8b0f Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 9 Jan 2007 19:58:05 +0000
Subject: Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/javax/naming/spi/DirStateFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libjava/classpath/javax/naming/spi/DirStateFactory.java')

diff --git a/libjava/classpath/javax/naming/spi/DirStateFactory.java b/libjava/classpath/javax/naming/spi/DirStateFactory.java
index b5add91cba7..6ddd12f3655 100644
--- a/libjava/classpath/javax/naming/spi/DirStateFactory.java
+++ b/libjava/classpath/javax/naming/spi/DirStateFactory.java
@@ -77,7 +77,7 @@ public interface DirStateFactory extends StateFactory
 
   DirStateFactory.Result getStateToBind(Object obj, Name name,
   					       Context nameCtx,
-					       Hashtable environment,
+					       Hashtable<?, ?> environment,
 					       Attributes inAttrs)
 					       throws NamingException;
 }
-- 
cgit v1.2.3