[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/InteropServices Marshal.cs,1.3,1.4

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/InteropServices
In directory 
subversions:/tmp/cvs-serv18333/runtime/System/Runtime/InteropServices

Modified Files:
        Marshal.cs 
Log Message:


Resolve some issues with compiling in ECMA-compatible modes.


Index: Marshal.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/InteropServices/Marshal.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Marshal.cs  5 Dec 2002 18:49:46 -0000       1.3
--- Marshal.cs  8 Dec 2002 06:24:40 -0000       1.4
***************
*** 23,28 ****
  {
  
- #if !ECMA_COMPAT
- 
  using System;
  using System.Runtime.CompilerServices;
--- 23,26 ----
***************
*** 30,33 ****
--- 28,34 ----
  using System.Threading;
  
+ // This class is not ECMA-compatible, strictly speaking.  But it is
+ // usually necessary for any application that uses PInvoke or C.
+ 
  public sealed class Marshal
  {
***************
*** 335,342 ****
--- 336,345 ----
                                throw new NotImplementedException();
                        }
+ #if !ECMA_COMPAT
        public static Guid GenerateGuidForType(Type type)
                        {
                                throw new NotImplementedException();
                        }
+ #endif
        public static String GenerateProgIdForType(Type type)
                        {
***************
*** 396,399 ****
--- 399,403 ----
                                throw new NotImplementedException();
                        }
+ #if !ECMA_COMPAT
        public static String GetTypeInfoName(UCOMITypeInfo pTI)
                        {
***************
*** 416,419 ****
--- 420,424 ----
                                throw new NotImplementedException();
                        }
+ #endif
        public static bool IsComObject(Object o)
                        {
***************
*** 424,431 ****
--- 429,438 ----
                                return false;
                        }
+ #if !ECMA_COMPAT
        public static int QueryInterface(IntPtr pUnk, ref Guid iid, out IntPtr 
ppv)
                        {
                                throw new NotImplementedException();
                        }
+ #endif
        public static IntPtr ReAllocCoTaskMem(IntPtr pv, int cb)
                        {
***************
*** 584,589 ****
  
  }; // class Marshal
- 
- #endif // !ECMA_COMPAT
  
  }; // namespace System.Runtime.InteropServices
--- 591,594 ----