Author: martin
Date: 2005-04-18 11:31:11 -0400 (Mon, 18 Apr 2005)
New Revision: 43223

Modified:
   trunk/mcs/gmcs/ChangeLog
   trunk/mcs/gmcs/attribute.cs
Log:
**** Merged r42383 from MCS ****


Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog    2005-04-18 15:13:45 UTC (rev 43222)
+++ trunk/mcs/gmcs/ChangeLog    2005-04-18 15:31:11 UTC (rev 43223)
@@ -1,3 +1,9 @@
+2005-03-30  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * attribute.cs: Fix the union of several permissions when some of them
+       are unrestricted (so the result isn't an unrestricted permission set).
+       Fix #74036.
+
 2005-03-30  Raja R Harinath  <[EMAIL PROTECTED]>
 
        * ecore.cs (MemberExpr): New class.  Convert from interface

Modified: trunk/mcs/gmcs/attribute.cs
===================================================================
--- trunk/mcs/gmcs/attribute.cs 2005-04-18 15:13:45 UTC (rev 43222)
+++ trunk/mcs/gmcs/attribute.cs 2005-04-18 15:31:11 UTC (rev 43223)
@@ -857,7 +857,7 @@
                                        ps = new PermissionSet 
(PermissionState.None);
 
                                permissions.Add (action, ps);
-                       } else if (!ps.IsUnrestricted () && sa.Unrestricted) {
+                       } else if (!ps.IsUnrestricted () && (sa is 
PermissionSetAttribute) && sa.Unrestricted) {
                                ps = ps.Union (new PermissionSet 
(PermissionState.Unrestricted));
                                permissions [action] = ps;
                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to