diff options
author | Raja R Harinath <harinath@hurrynot.org> | 2006-03-26 17:43:58 +0400 |
---|---|---|
committer | Raja R Harinath <harinath@hurrynot.org> | 2006-03-26 17:43:58 +0400 |
commit | 72c9026bac876b7e0ef78e93c9a2bcc8b48f342e (patch) | |
tree | 46f787c303a34f9a6478687141a613f9a21d79c9 /mcs/gmcs/typemanager.cs | |
parent | 183a50b6f3d69bd7c4e1c9c10b178e906ceb97f9 (diff) |
*** merged revision 57555 from mcs
svn path=/trunk/mcs/; revision=58544
Diffstat (limited to 'mcs/gmcs/typemanager.cs')
-rw-r--r-- | mcs/gmcs/typemanager.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mcs/gmcs/typemanager.cs b/mcs/gmcs/typemanager.cs index 221989a2d03..b8f82781aad 100644 --- a/mcs/gmcs/typemanager.cs +++ b/mcs/gmcs/typemanager.cs @@ -2035,16 +2035,12 @@ public partial class TypeManager { /// This expands in context like: IA; IB : IA; IC : IA, IB; the interface "IC" to /// be IA, IB, IC. /// </remarks> - public static Type[] ExpandInterfaces (IResolveContext ec, TypeExpr [] base_interfaces) + public static Type[] ExpandInterfaces (TypeExpr [] base_interfaces) { ArrayList new_ifaces = new ArrayList (); foreach (TypeExpr iface in base_interfaces){ - TypeExpr texpr = iface.ResolveAsTypeTerminal (ec, false); - if (texpr == null) - return null; - - Type itype = texpr.ResolveType (ec); + Type itype = iface.Type; if (new_ifaces.Contains (itype)) continue; |