2008-03-27 Marek Safar <marek.safar@gmail.com>

	* convert.cs (ImplicitReferenceConversionCore): Correctly compare enum type
	and not rely on broken IsEnum.

svn path=/trunk/mcs/; revision=99120

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 73093c8fe15bd609588e0a20f11c8d3a65f41983..6d43292962c52fbc5228fdb2ce3c2e578beaf804 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-27  Marek Safar  <marek.safar@gmail.com>
+
+       * convert.cs (ImplicitReferenceConversionCore): Correctly compare enum type
+       and not rely on broken IsEnum.
+
 2008-03-27  Marek Safar  <marek.safar@gmail.com>
 
        * nullable.cs: New file, extracted from generic.cs.

diff --git a/mcs/mcs/convert.cs b/mcs/mcs/convert.cs
index 7aa1a30e63cfa5afccb0c7fc16a931ae5f68a11b..650301ddf3915cc6a0fd9810357e03ba404c2f69 100644 (file)
--- a/mcs/mcs/convert.cs
+++ b/mcs/mcs/convert.cs
@@ -324,9 +324,9 @@ namespace Mono.CSharp {
                                // System.Enum is not a value type, it is a class, so we need
                                // a boxing conversion
                                //
-                               if (expr_type.IsEnum || TypeManager.IsGenericParameter (expr_type))
+                               if (target_type == TypeManager.enum_type || TypeManager.IsGenericParameter (expr_type))
                                        return false;
-
+                               
                                return true;
                        }