[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System AttributeTargets.cs,1
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System AttributeTargets.cs,1.4,1.5 DateTime.cs,1.20,1.21 Delegate.cs,1.9,1.10 Object.cs,1.7,1.8 RuntimeFieldHandle.cs,1.6,1.7 RuntimeTypeHandle.cs,1.6,1.7 Type.cs,1.19,1.20 _AppDomain.cs,1.2,1.3 |
Date: |
Tue, 15 Apr 2003 23:17:57 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System
In directory subversions:/tmp/cvs-serv5830/runtime/System
Modified Files:
AttributeTargets.cs DateTime.cs Delegate.cs Object.cs
RuntimeFieldHandle.cs RuntimeTypeHandle.cs Type.cs
_AppDomain.cs
Log Message:
Modifications to allow the library to be built with the
"RuntimeInfrastructure" subset turned off.
Index: AttributeTargets.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/AttributeTargets.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AttributeTargets.cs 15 Apr 2003 05:13:43 -0000 1.4
--- AttributeTargets.cs 16 Apr 2003 03:17:55 -0000 1.5
***************
*** 26,32 ****
{
Assembly = 0x0001,
- #if CONFIG_RUNTIME_INFRA
Module = 0x0002,
- #endif
Class = 0x0004,
Struct = 0x0008,
--- 26,30 ----
Index: DateTime.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/DateTime.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** DateTime.cs 15 Apr 2003 07:27:54 -0000 1.20
--- DateTime.cs 16 Apr 2003 03:17:55 -0000 1.21
***************
*** 28,32 ****
--- 28,34 ----
// ECMA requires that this have "auto" layout.
+ #if CONFIG_RUNTIME_INFRA
[StructLayout(LayoutKind.Auto)]
+ #endif
public struct DateTime : IComparable, IFormattable
#if !ECMA_COMPAT
Index: Delegate.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Delegate.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Delegate.cs 15 Apr 2003 11:22:32 -0000 1.9
--- Delegate.cs 16 Apr 2003 03:17:55 -0000 1.10
***************
*** 35,39 ****
--- 35,43 ----
// delegates from function pointers correctly.
internal Object target;
+ #if CONFIG_RUNTIME_INFRA
internal RuntimeMethodHandle method;
+ #else
+ internal IntPtr method;
+ #endif
internal IntPtr closure;
***************
*** 303,308 ****
--- 307,317 ----
if(((Object)d) != null && GetType() ==
d.GetType())
{
+ #if CONFIG_RUNTIME_INFRA
return (target == d.target &&
method.Value ==
d.method.Value);
+ #else
+ return (target == d.target &&
+ method == d.method);
+ #endif
}
else
***************
*** 440,444 ****
--- 449,457 ----
protected virtual Delegate RemoveImpl(Delegate d)
{
+ #if CONFIG_RUNTIME_INFRA
if(target == d.target && method.Value ==
d.method.Value)
+ #else
+ if(target == d.target && method == d.method)
+ #endif
{
return null;
Index: Object.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Object.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Object.cs 18 Jun 2002 02:04:58 -0000 1.7
--- Object.cs 16 Apr 2003 03:17:55 -0000 1.8
***************
*** 75,78 ****
--- 75,80 ----
}
+ #if CONFIG_RUNTIME_INFRA
+
// Cached copy of the resources for this assembly.
private static ResourceManager resources = null;
***************
*** 108,111 ****
--- 110,123 ----
}
}
+
+ #else // !CONFIG_RUNTIME_INFRA
+
+ // We don't have sufficient runtime support for loading resources.
+ internal static String _(String tag)
+ {
+ return tag;
+ }
+
+ #endif // !CONFIG_RUNTIME_INFRA
}; // class Object
Index: RuntimeFieldHandle.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/RuntimeFieldHandle.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** RuntimeFieldHandle.cs 15 Apr 2003 05:13:43 -0000 1.6
--- RuntimeFieldHandle.cs 16 Apr 2003 03:17:55 -0000 1.7
***************
*** 23,28 ****
{
- #if CONFIG_RUNTIME_INFRA
-
using System.Runtime.Serialization;
--- 23,26 ----
***************
*** 72,77 ****
}; // class RuntimeFieldHandle
-
- #endif // CONFIG_RUNTIME_INFRA
}; // namespace System
--- 70,73 ----
Index: RuntimeTypeHandle.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/RuntimeTypeHandle.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** RuntimeTypeHandle.cs 15 Apr 2003 05:13:43 -0000 1.6
--- RuntimeTypeHandle.cs 16 Apr 2003 03:17:55 -0000 1.7
***************
*** 22,27 ****
{
- #if CONFIG_RUNTIME_INFRA
-
using System.Runtime.Serialization;
--- 22,25 ----
***************
*** 71,76 ****
}; // class RuntimeTypeHandle
-
- #endif // CONFIG_RUNTIME_INFRA
}; // namespace System
--- 69,72 ----
Index: Type.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Type.cs,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** Type.cs 15 Apr 2003 11:22:32 -0000 1.19
--- Type.cs 16 Apr 2003 03:17:55 -0000 1.20
***************
*** 235,238 ****
--- 235,242 ----
#endif
+ // Get a type from a runtime type handle.
+ [MethodImpl(MethodImplOptions.InternalCall)]
+ extern public static Type GetTypeFromHandle(RuntimeTypeHandle handle);
+
#if CONFIG_RUNTIME_INFRA
***************
*** 240,247 ****
[MethodImpl(MethodImplOptions.InternalCall)]
extern public static RuntimeTypeHandle GetTypeHandle(Object obj);
-
- // Get a type from a runtime type handle.
- [MethodImpl(MethodImplOptions.InternalCall)]
- extern public static Type GetTypeFromHandle(RuntimeTypeHandle handle);
// Infrastructure properties.
--- 244,247 ----
Index: _AppDomain.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/_AppDomain.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** _AppDomain.cs 29 Mar 2003 01:38:07 -0000 1.2
--- _AppDomain.cs 16 Apr 2003 03:17:55 -0000 1.3
***************
*** 22,25 ****
--- 22,27 ----
{
+ #if CONFIG_RUNTIME_INFRA
+
using System.Reflection;
using System.Reflection.Emit;
***************
*** 218,221 ****
--- 220,225 ----
}; // interface _AppDomain
+
+ #endif // CONFIG_RUNTIME_INFRA
}; // namespace System
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/runtime/System AttributeTargets.cs,1.4,1.5 DateTime.cs,1.20,1.21 Delegate.cs,1.9,1.10 Object.cs,1.7,1.8 RuntimeFieldHandle.cs,1.6,1.7 RuntimeTypeHandle.cs,1.6,1.7 Type.cs,1.19,1.20 _AppDomain.cs,1.2,1.3,
Rhys Weatherley <address@hidden> <=