From f603229f0e08dad71da12a8618e077beb70f2722 Mon Sep 17 00:00:00 2001 From: Paolo Molaro Date: Sat, 13 Jul 2002 13:12:56 +0000 Subject: [PATCH] Sat Jul 13 15:10:32 CEST 2002 Paolo Molaro * typemanager.cs: fix TypeToCoreType() to handle void and object (corlib gets no more typerefs after this change). svn path=/trunk/mcs/; revision=5756 --- mcs/mcs/ChangeLog | 6 ++++++ mcs/mcs/typemanager.cs | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog index 0831cc6108c..c54924ecd30 100755 --- a/mcs/mcs/ChangeLog +++ b/mcs/mcs/ChangeLog @@ -1,3 +1,9 @@ + +Sat Jul 13 15:10:32 CEST 2002 Paolo Molaro + + * typemanager.cs: fix TypeToCoreType() to handle void and object + (corlib gets no more typerefs after this change). + 2002-07-12 Miguel de Icaza * expression.cs (ArrayCreation.EmitArrayArguments): use diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs index ace12a5a4d4..4eb59bc2bc8 100755 --- 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; } } -- 2.25.1