Sat Jul 13 15:10:32 CEST 2002 Paolo Molaro <lupus@ximian.com>

	* typemanager.cs: fix TypeToCoreType() to handle void and object
	(corlib gets no more typerefs after this change).

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 0831cc6108cbf67c83948c71be1ebe28aa0750e2..c54924ecd30975d1716765808c119e354c01ceff 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+
+Sat Jul 13 15:10:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+       * typemanager.cs: fix TypeToCoreType() to handle void and object
+       (corlib gets no more typerefs after this change).
+
 2002-07-12  Miguel de Icaza  <miguel@ximian.com>
 
        * expression.cs (ArrayCreation.EmitArrayArguments): use

diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs
index ace12a5a4d4057fa3b6e7a48e096c64f855d473e..4eb59bc2bc80dd3ce3ad3befbb006913af9d3d5c 100755 (executable)
--- a/mcs/mcs/typemanager.cs
+++ b/mcs/mcs/typemanager.cs
@@ -1387,6 +1387,10 @@ public class TypeManager {
                case TypeCode.String:
                        return TypeManager.string_type;
                default:
+                       if (t == typeof (void))
+                               return TypeManager.void_type;
+                       if (t == typeof (object))
+                               return TypeManager.object_type;
                        return t;
                }
        }