Merged gcj-eclipse branch to trunk.

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

1 files changed, 2 insertions, 4 deletions

diff --git a/libjava/classpath/java/lang/instrument/ClassDefinition.java b/libjava/classpath/java/lang/instrument/ClassDefinition.java
index 841597c31ed..f2fbf929667 100644
--- a/libjava/classpath/java/lang/instrument/ClassDefinition.java
+++ b/libjava/classpath/java/lang/instrument/ClassDefinition.java
@@ -60,8 +60,7 @@ public final class ClassDefinition
    * @param theClassFile the new class file
    * @throws NullPointerException if one of the argument is null
    */
-  /* FIXME[GENERICS]: Signature should be (Class<?>, byte[]) */
-  public ClassDefinition(Class theClass, byte[] theClassFile)
+  public ClassDefinition(Class<?> theClass, byte[] theClassFile)
   {
     if (theClass == null || theClassFile == null)
       throw new NullPointerException();
@@ -72,8 +71,7 @@ public final class ClassDefinition
   /**
    * @return the Class
    */
-  /* FIXME[GENERICS]: Should return Class<?> */
-  public Class getDefinitionClass()
+  public Class<?> getDefinitionClass()
   {
     return theClass;
   }