2004-08-04 Miguel de Icaza <miguel@ximian.com>

	* cfold.cs: Synchronize the folding with the code in expression.cs
	Binary.DoNumericPromotions for uint operands.

svn path=/branches/mono-1-0/mcs/; revision=31885

2 files changed, 9 insertions, 0 deletions

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index da2737a8faf..9993e6340bb 100755
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-04  Miguel de Icaza  <miguel@ximian.com>
+ 
+	* cfold.cs: Synchronize the folding with the code in expression.cs
+	Binary.DoNumericPromotions for uint operands.
+
+
 2004-08-03  Ben Maurer  <bmaurer@ximian.com>
 
 	* ecore.cs (MethodGroupExpr): new IsBase property.
diff --git a/mcs/mcs/cfold.cs b/mcs/mcs/cfold.cs
index 8ffdfb75030..12999eccdd8 100755
--- a/mcs/mcs/cfold.cs
+++ b/mcs/mcs/cfold.cs
@@ -128,6 +128,9 @@ namespace Mono.CSharp {
 				if (other is SByteConstant || other is ShortConstant || ic != null){
 					left = left.ToLong (loc);
 					right = right.ToLong (loc);
+				} else {
+					left = left.ToUInt (loc);
+					right = left.ToUInt (loc);
 				}
 
 				return;