[Dotgnu-pnet-commits] CVS: pnetlib/System S.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System
In directory subversions:/tmp/cvs-serv6765/System

Modified Files:
        S.cs 
Log Message:


Mark the contents of "System.Resources" as non-ECMA and introduce
a cut-down resource API for use in ECMA_COMPAT mode in the other assemblies.


Index: S.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/S.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** S.cs        21 Apr 2002 03:24:53 -0000      1.1
--- S.cs        15 Apr 2003 01:48:05 -0000      1.2
***************
*** 32,37 ****
--- 32,42 ----
  {
        // Cached copy of the resources for this assembly and mscorlib.
+ #if ECMA_COMPAT
+       private static ECMAResourceManager systemResources = null;
+       private static ECMAResourceManager runtimeResources = null;
+ #else
        private static ResourceManager systemResources = null;
        private static ResourceManager runtimeResources = null;
+ #endif
  
        // Helper for obtaining string resources for this assembly.
***************
*** 45,50 ****
--- 50,60 ----
                                        if(systemResources == null)
                                        {
+                                       #if ECMA_COMPAT
+                                               systemResources = new 
ECMAResourceManager
+                                                       ("System", 
(typeof(S)).Assembly);
+                                       #else
                                                systemResources = new 
ResourceManager
                                                        ("System", 
(typeof(S)).Assembly);
+                                       #endif
                                        }
                                        value = systemResources.GetString(tag, 
null);
***************
*** 57,62 ****
--- 67,77 ----
                                        if(runtimeResources == null)
                                        {
+                                       #if ECMA_COMPAT
+                                               runtimeResources = new 
ECMAResourceManager
+                                                       ("runtime", 
(typeof(String)).Assembly);
+                                       #else
                                                runtimeResources = new 
ResourceManager
                                                        ("runtime", 
(typeof(String)).Assembly);
+                                       #endif
                                        }
                                        return runtimeResources.GetString(tag, 
null);