Author: martin
Date: 2005-04-19 13:51:12 -0400 (Tue, 19 Apr 2005)
New Revision: 43273
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/doc.cs
Log:
**** Merged r42890 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-19 17:50:51 UTC (rev 43272)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-19 17:51:12 UTC (rev 43273)
@@ -1,3 +1,8 @@
+2005-04-13 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * doc.cs : delegates must not be referenced with parameters.
+ Fixed bug #71605.
+
2005-04-12 Miguel de Icaza <[EMAIL PROTECTED]>
* typemanager.cs (IsUnmanagedType): Arrays are allowed.
Modified: trunk/mcs/gmcs/doc.cs
===================================================================
--- trunk/mcs/gmcs/doc.cs 2005-04-19 17:50:51 UTC (rev 43272)
+++ trunk/mcs/gmcs/doc.cs 2005-04-19 17:51:12 UTC (rev 43273)
@@ -438,7 +438,7 @@
return null;
}
}
- // here we still does not consider return type (to
+ // here we still don't consider return type (to
// detect CS1581 or CS1002+CS1584).
msig = new MethodSignature (oper, null, paramList);
mis = type.FindMembers (
@@ -558,7 +558,10 @@
}
Type type = FindDocumentedType (mc, name, ds, cref);
- if (type != null) {
+ if (type != null
+ // delegate must not be referenced with args
+ && (!type.IsSubclassOf (typeof
(System.Delegate))
+ || parameterTypes.Length == 0)) {
xref.SetAttribute ("cref", "T:" +
type.FullName.Replace ("+", "."));
return; // a type
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
