Merged gcj-eclipse branch to trunk.
From-SVN: r120621
This commit is contained in:
parent
c648dedbde
commit
97b8365caf
17478 changed files with 606493 additions and 100744 deletions
|
@ -1,5 +1,5 @@
|
|||
/* SecurityManager.java -- security checks for privileged actions
|
||||
Copyright (C) 1998, 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 1998, 1999, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
@ -240,7 +240,7 @@ public class SecurityManager
|
|||
* @return the most recent non-system Class on the execution stack
|
||||
* @deprecated use {@link #checkPermission(Permission)} instead
|
||||
*/
|
||||
protected Class currentLoadedClass()
|
||||
protected Class<?> currentLoadedClass()
|
||||
{
|
||||
int i = classLoaderDepth();
|
||||
return i >= 0 ? getClassContext()[i] : null;
|
||||
|
@ -983,7 +983,7 @@ public class SecurityManager
|
|||
* @see Member#PUBLIC
|
||||
* @since 1.1
|
||||
*/
|
||||
public void checkMemberAccess(Class c, int memberType)
|
||||
public void checkMemberAccess(Class<?> c, int memberType)
|
||||
{
|
||||
if (c == null)
|
||||
throw new NullPointerException();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue