Author: martin
Date: 2005-04-20 04:55:07 -0400 (Wed, 20 Apr 2005)
New Revision: 43321
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/expression.cs
Log:
**** Merged r43126 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-20 08:54:45 UTC (rev 43320)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-20 08:55:07 UTC (rev 43321)
@@ -1,5 +1,9 @@
2005-04-16 Miguel de Icaza <[EMAIL PROTECTED]>
+ * expression.cs (Binary.ResolveOperator): Apply patch from John
+ Luke to fix bug 59864: operators &, | and ^ on enumerations
+ require that the same enum type on both sides.
+
* driver.cs: Add warnings to old flag usage, this is to assist
people who produce Makefiles and hope that the Makefiles will be
used on Windows.
Modified: trunk/mcs/gmcs/expression.cs
===================================================================
--- trunk/mcs/gmcs/expression.cs 2005-04-20 08:54:45 UTC (rev 43320)
+++ trunk/mcs/gmcs/expression.cs 2005-04-20 08:55:07 UTC (rev 43321)
@@ -2622,6 +2622,10 @@
if (oper == Operator.BitwiseAnd ||
oper == Operator.BitwiseOr ||
oper == Operator.ExclusiveOr){
+ if (left.Type != right.Type){
+ Error_OperatorCannotBeApplied
();
+ return null;
+ }
type = l;
return this;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
