From 42b8f608b36c537e4c7676925a7da70e4a4e9a21 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Tue, 8 Dec 2009 12:31:36 +0000 Subject: [PATCH] 2009-12-08 Marek Safar A fix for bug #561369 expression.cs (DoNumericPromotion): Fixed typo. svn path=/trunk/mcs/; revision=147841 --- mcs/mcs/ChangeLog | 5 +++++ mcs/mcs/expression.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog index 45bb8ab351fb7..0badb0c6d163a 100644 --- a/mcs/mcs/ChangeLog +++ b/mcs/mcs/ChangeLog @@ -1,3 +1,8 @@ +2009-12-08 Marek Safar + + A fix for bug #561369 + expression.cs (DoNumericPromotion): Fixed typo. + 2009-12-08 Marek Safar *.cs: Moving to generics world. diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs index 34d0a915c90af..820a363724f41 100644 --- 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; }