[Ikvm-commit] ikvm/reflect Type.cs, 1.113, 1.114 Universe.cs, 1.82, 1.83

[Jeroen F. <jfr...@us...>]

Update of /cvsroot/ikvm/ikvm/reflect
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32381

Modified Files:
	Type.cs Universe.cs 
Log Message:
Implemented Type.IsContextful and Type.IsMarshalByRef without relying on Import.

Index: Universe.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/reflect/Universe.cs,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** Universe.cs	1 Jul 2016 05:44:41 -0000	1.82
--- Universe.cs	1 Jul 2016 05:57:10 -0000	1.83
***************
*** 182,185 ****
--- 182,187 ----
  		private Type typeof_System_Decimal;
  		private Type typeof_System_AttributeUsageAttribute;
+ 		private Type typeof_System_ContextBoundObject;
+ 		private Type typeof_System_MarshalByRefObject;
  		private Type typeof_System_Runtime_InteropServices_DllImportAttribute;
  		private Type typeof_System_Runtime_InteropServices_FieldOffsetAttribute;
***************
*** 399,402 ****
--- 401,414 ----
  		}
  
+ 		internal Type System_ContextBoundObject
+ 		{
+ 			get { return typeof_System_ContextBoundObject ?? (typeof_System_ContextBoundObject = ImportMscorlibType("System", "ContextBoundObject")); }
+ 		}
+ 
+ 		internal Type System_MarshalByRefObject
+ 		{
+ 			get { return typeof_System_MarshalByRefObject ?? (typeof_System_MarshalByRefObject = ImportMscorlibType("System", "MarshalByRefObject")); }
+ 		}
+ 
  		internal Type System_Runtime_InteropServices_DllImportAttribute
  		{

Index: Type.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/reflect/Type.cs,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** Type.cs	1 Jul 2016 05:15:22 -0000	1.113
--- Type.cs	1 Jul 2016 05:57:10 -0000	1.114
***************
*** 1422,1436 ****
  		}
  
- #if !CORECLR
  		public bool IsContextful
  		{
! 			get { return IsSubclassOf(this.Module.universe.Import(typeof(ContextBoundObject))); }
  		}
  
  		public bool IsMarshalByRef
  		{
! 			get { return IsSubclassOf(this.Module.universe.Import(typeof(MarshalByRefObject))); }
  		}
- #endif
  
  		public virtual bool IsVisible
--- 1422,1434 ----
  		}
  
  		public bool IsContextful
  		{
! 			get { return IsSubclassOf(this.Module.universe.System_ContextBoundObject); }
  		}
  
  		public bool IsMarshalByRef
  		{
! 			get { return IsSubclassOf(this.Module.universe.System_MarshalByRefObject); }
  		}
  
  		public virtual bool IsVisible