2009-12-08 Marek Safar <marek.safar@gmail.com>

A fix for bug #561369 expression.cs (DoNumericPromotion): Fixed typo. svn path=/trunk/mcs/; revision=147841
mono · Dec 8, 2009 · 42b8f60 · 42b8f60
1 parent 96a1e64
commit 42b8f60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08  Marek Safar  <marek.safar@gmail.com>
+
+	A fix for bug #561369
+	expression.cs (DoNumericPromotion): Fixed typo.
+
 2009-12-08  Marek Safar  <marek.safar@gmail.com>
 
 	*.cs: Moving to generics world.

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
@@ -2572,7 +2572,7 @@ static bool DoNumericPromotion (ResolveContext rc, ref Expression prim_expr, ref
 				// A compile-time error occurs if the other operand is of type sbyte, short, int, or long
 				//
 				if (type == TypeManager.int32_type || type == TypeManager.int64_type ||
-					type == TypeManager.sbyte_type || type == TypeManager.sbyte_type)
+					type == TypeManager.short_type || type == TypeManager.sbyte_type)
 					return false;
 			}