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/java/security/PrivilegedAction.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libjava/classpath/java/security/PrivilegedAction.java')

diff --git a/libjava/classpath/java/security/PrivilegedAction.java b/libjava/classpath/java/security/PrivilegedAction.java
index c3a41346f9c..1a51eaade78 100644
--- a/libjava/classpath/java/security/PrivilegedAction.java
+++ b/libjava/classpath/java/security/PrivilegedAction.java
@@ -47,9 +47,9 @@ package java.security;
  * @see AccessController
  * @see PrivilegedExceptionAction
  * @since 1.1
- * @status updated to 1.4
+ * @status updated to 1.5
  */
-public interface PrivilegedAction
+public interface PrivilegedAction<T>
 {
   /**
    * This method performs an operation that requires higher privileges to
@@ -60,5 +60,5 @@ public interface PrivilegedAction
    * @see AccessController#doPrivileged(PrivilegedAction)
    * @see AccessController#doPrivileged(PrivilegedAction, AccessControlContext)
    */
-  Object run();
+  T run();
 } // interface PrivilegedAction
-- 
cgit v1.2.1