Author: martin
Date: 2005-04-19 10:54:33 -0400 (Tue, 19 Apr 2005)
New Revision: 43262
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/class.cs
Log:
**** Merged r42687 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-19 14:53:42 UTC (rev 43261)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-19 14:54:33 UTC (rev 43262)
@@ -1,3 +1,9 @@
+2005-04-08 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix #74510.
+ * class.cs (OperatorArrayList.CheckPairedOperators): Skip
+ operators that had errors reported on them.
+
2005-04-08 Marek Safar <[EMAIL PROTECTED]>
* attribute.cs (Attribute.IsValidArgumentType): Test valid named
Modified: trunk/mcs/gmcs/class.cs
===================================================================
--- trunk/mcs/gmcs/class.cs 2005-04-19 14:53:42 UTC (rev 43261)
+++ trunk/mcs/gmcs/class.cs 2005-04-19 14:54:33 UTC (rev 43262)
@@ -273,7 +273,11 @@
// Register all the operators we care about.
foreach (Operator op in this){
int reg = 0;
-
+
+ // Skip erroneous code.
+ if (op.OperatorMethod == null)
+ continue;
+
switch (op.OperatorType){
case Operator.OpType.Equality:
reg = 1;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
