dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System ArgIterator.cs,1.7,1.8


From: Rhys Weatherley <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnetlib/runtime/System ArgIterator.cs,1.7,1.8 Array.cs,1.23,1.24 BitConverter.cs,1.4,1.5 Buffer.cs,1.1,1.2 Console.cs,1.10,1.11 Delegate.cs,1.10,1.11 Environment.cs,1.12,1.13 Exception.cs,1.20,1.21 IAppDomainSetup.cs,1.1,1.2 LoaderOptimization.cs,1.3,1.4 Object.cs,1.8,1.9 PlatformID.cs,1.3,1.4 String.cs,1.33,1.34 Type.cs,1.21,1.22 TypedReference.cs,1.5,1.6 _AppDomain.cs,1.4,1.5
Date: Wed, 23 Apr 2003 01:39:51 -0400

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

Modified Files:
        ArgIterator.cs Array.cs BitConverter.cs Buffer.cs Console.cs 
        Delegate.cs Environment.cs Exception.cs IAppDomainSetup.cs 
        LoaderOptimization.cs Object.cs PlatformID.cs String.cs 
        Type.cs TypedReference.cs _AppDomain.cs 
Log Message:


Minor tweaks to a lot of classes to make them more signature compatible
with .NET Framework SDK 1.1.


Index: ArgIterator.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/ArgIterator.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ArgIterator.cs      22 Apr 2003 12:17:29 -0000      1.7
--- ArgIterator.cs      23 Apr 2003 05:39:48 -0000      1.8
***************
*** 2,6 ****
   * ArgIterator.cs - Implementation of the "System.ArgIterator" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * ArgIterator.cs - Implementation of the "System.ArgIterator" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 44,48 ****
  
        // Move the iterator to the end of the argument list.
!       [MethodImpl(MethodImplOptions.InternalCall), CLSCompliant(false)]
        extern public void End();
  
--- 44,48 ----
  
        // Move the iterator to the end of the argument list.
!       [MethodImpl(MethodImplOptions.InternalCall)]
        extern public void End();
  

Index: Array.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Array.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** Array.cs    22 Apr 2003 12:17:29 -0000      1.23
--- Array.cs    23 Apr 2003 05:39:48 -0000      1.24
***************
*** 1406,1414 ****
                }
        }
- #if ECMA_COMPAT
        public long LongLength
- #else
-       private long LongLength
- #endif
        {
                get
--- 1406,1410 ----

Index: BitConverter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/BitConverter.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** BitConverter.cs     22 Apr 2003 12:17:29 -0000      1.4
--- BitConverter.cs     23 Apr 2003 05:39:48 -0000      1.5
***************
*** 2,6 ****
   * BitConverter.cs - Implementation of the "System.BitConverter" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * BitConverter.cs - Implementation of the "System.BitConverter" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 517,521 ****
  
        // Append the hex version of a byte to a string builder.
!       public static void AppendHex(StringBuilder builder, int value)
                        {
                                int digit = ((value / 16) & 0x0F);
--- 517,521 ----
  
        // Append the hex version of a byte to a string builder.
!       internal static void AppendHex(StringBuilder builder, int value)
                        {
                                int digit = ((value / 16) & 0x0F);

Index: Buffer.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Buffer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Buffer.cs   29 Nov 2001 23:41:42 -0000      1.1
--- Buffer.cs   23 Apr 2003 05:39:48 -0000      1.2
***************
*** 2,6 ****
   * Buffer.cs - Implementation of the "System.Buffer" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * Buffer.cs - Implementation of the "System.Buffer" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 28,31 ****
--- 28,34 ----
  public sealed class Buffer
  {
+       // Cannot instantiate this class.
+       private Buffer() {}
+ 
        // Validate a primitive array and get its length in bytes.
        private static int ValidatePrimitive(Array array, String name)

Index: Console.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Console.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Console.cs  15 Apr 2003 07:27:54 -0000      1.10
--- Console.cs  23 Apr 2003 05:39:48 -0000      1.11
***************
*** 2,6 ****
   * Console.cs - Implementation of the "System.Console" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * Console.cs - Implementation of the "System.Console" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 206,209 ****
--- 206,229 ----
                                Out.Write(format, args);
                        }
+ #if !ECMA_COMPAT
+       [CLSCompliant(false)]
+       public static void Write(String format, Object arg0, Object arg1,
+                                                        Object arg2, Object 
arg3, __arglist)
+                       {
+                               ArgIterator iter = new ArgIterator(__arglist);
+                               Object[] list = new Object [4 + 
iter.GetRemainingCount()];
+                               list[0] = arg0;
+                               list[1] = arg1;
+                               list[2] = arg2;
+                               list[3] = arg3;
+                               int posn = 4;
+                               while(posn < list.Length)
+                               {
+                                       list[posn] = 
TypedReference.ToObject(iter.GetNextArg());
+                                       ++posn;
+                               }
+                               Out.Write(format, list);
+                       }
+ #endif // !ECMA_COMPAT
  
        // Write primitive values to standard output.
***************
*** 289,292 ****
--- 309,332 ----
                                Out.WriteLine(format, args);
                        }
+ #if !ECMA_COMPAT
+       [CLSCompliant(false)]
+       public static void WriteLine(String format, Object arg0, Object arg1,
+                                                            Object arg2, 
Object arg3, __arglist)
+                       {
+                               ArgIterator iter = new ArgIterator(__arglist);
+                               Object[] list = new Object [4 + 
iter.GetRemainingCount()];
+                               list[0] = arg0;
+                               list[1] = arg1;
+                               list[2] = arg2;
+                               list[3] = arg3;
+                               int posn = 4;
+                               while(posn < list.Length)
+                               {
+                                       list[posn] = 
TypedReference.ToObject(iter.GetNextArg());
+                                       ++posn;
+                               }
+                               Out.WriteLine(format, list);
+                       }
+ #endif // !ECMA_COMPAT
  
        // Write primitive values to standard output followed by a newline.

Index: Delegate.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Delegate.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Delegate.cs 16 Apr 2003 03:17:55 -0000      1.10
--- Delegate.cs 23 Apr 2003 05:39:48 -0000      1.11
***************
*** 23,29 ****
--- 23,33 ----
  
  using System.Reflection;
+ using System.Runtime.InteropServices;
  using System.Runtime.CompilerServices;
  using System.Runtime.Serialization;
  
+ #if !ECMA_COMPAT
+ [ClassInterface(ClassInterfaceType.AutoDual)]
+ #endif
  public abstract class Delegate : ICloneable
  #if !ECMA_COMPAT

Index: Environment.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Environment.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Environment.cs      22 Apr 2003 12:17:29 -0000      1.12
--- Environment.cs      23 Apr 2003 05:39:48 -0000      1.13
***************
*** 86,94 ****
  
        // Determine if application shutdown has started.
- #if ECMA_COMPAT
        public static bool HasShutdownStarted
- #else
-       public bool HasShutdownStarted
- #endif
                        {
                                get
--- 86,90 ----

Index: Exception.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Exception.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Exception.cs        22 Apr 2003 12:17:29 -0000      1.20
--- Exception.cs        23 Apr 2003 05:39:48 -0000      1.21
***************
*** 23,26 ****
--- 23,27 ----
  
  using System.Reflection;
+ using System.Runtime.InteropServices;
  using System.Runtime.Serialization;
  using System.Diagnostics;
***************
*** 52,55 ****
--- 53,59 ----
  */
  
+ #if !ECMA_COMPAT
+ [ClassInterface(ClassInterfaceType.AutoDual)]
+ #endif
  public class Exception
  #if !ECMA_COMPAT

Index: IAppDomainSetup.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IAppDomainSetup.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** IAppDomainSetup.cs  1 Feb 2003 03:31:45 -0000       1.1
--- IAppDomainSetup.cs  23 Apr 2003 05:39:48 -0000      1.2
***************
*** 24,27 ****
--- 24,31 ----
  #if !ECMA_COMPAT
  
+ using System.Runtime.InteropServices;
+ 
+ [Guid("27FFF232-A7A8-40dd-8D4A-734AD59FCD41")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
  public interface IAppDomainSetup
  {

Index: LoaderOptimization.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/LoaderOptimization.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** LoaderOptimization.cs       15 Apr 2003 04:37:44 -0000      1.3
--- LoaderOptimization.cs       23 Apr 2003 05:39:48 -0000      1.4
***************
*** 26,33 ****
  public enum LoaderOptimization
  {
!       NotSpecified    = 0,
!       SingleDomain    = 1,
!       MultiDomain     = 2,
!       MultiDomainHost = 3
  
  }; // enum LoaderOptimization
--- 26,35 ----
  public enum LoaderOptimization
  {
!       NotSpecified     = 0,
!       SingleDomain     = 1,
!       MultiDomain      = 2,
!       DomainMask       = 3,
!       MultiDomainHost  = 3,
!       DisallowBindings = 4,
  
  }; // enum LoaderOptimization

Index: Object.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Object.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Object.cs   16 Apr 2003 03:17:55 -0000      1.8
--- Object.cs   23 Apr 2003 05:39:48 -0000      1.9
***************
*** 2,6 ****
   * Object.cs - Implementation of the "System.Object" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * Object.cs - Implementation of the "System.Object" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 23,29 ****
--- 23,33 ----
  
  using System.Reflection;
+ using System.Runtime.InteropServices;
  using System.Runtime.CompilerServices;
  using System.Resources;
  
+ #if !ECMA_COMPAT
+ [ClassInterface(ClassInterfaceType.AutoDual)]
+ #endif
  public class Object
  {

Index: PlatformID.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/PlatformID.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PlatformID.cs       15 Apr 2003 04:37:44 -0000      1.3
--- PlatformID.cs       23 Apr 2003 05:39:48 -0000      1.4
***************
*** 29,32 ****
--- 29,33 ----
        Win32Windows = 1,
        Win32NT      = 2,
+       WinCE        = 3,
        Unix         = 128
  

Index: String.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/String.cs,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** String.cs   15 Apr 2003 05:13:43 -0000      1.33
--- String.cs   23 Apr 2003 05:39:48 -0000      1.34
***************
*** 465,475 ****
                        }
  #if !ECMA_COMPAT
        public static String Concat(Object obj1, Object obj2,
!                                                               Object obj3, 
Object obj4)
                        {
!                               return Concat((obj1 != null ? obj1.ToString() : 
null),
!                                                         (obj2 != null ? 
obj2.ToString() : null),
!                                                         (obj3 != null ? 
obj3.ToString() : null),
!                                                         (obj4 != null ? 
obj4.ToString() : null));
                        }
  #endif
--- 465,495 ----
                        }
  #if !ECMA_COMPAT
+       [CLSCompliant(false)]
        public static String Concat(Object obj1, Object obj2,
!                                                               Object obj3, 
Object obj4,
!                                                               __arglist)
                        {
!                               ArgIterator iter = new ArgIterator(__arglist);
!                               String[] list = new String [4 + 
iter.GetRemainingCount()];
!                               list[0] = (obj1 != null ? obj1.ToString() : 
null);
!                               list[1] = (obj2 != null ? obj2.ToString() : 
null);
!                               list[2] = (obj3 != null ? obj3.ToString() : 
null);
!                               list[3] = (obj4 != null ? obj4.ToString() : 
null);
!                               int posn = 4;
!                               Object obj;
!                               while(posn < list.Length)
!                               {
!                                       obj = 
TypedReference.ToObject(iter.GetNextArg());
!                                       if(obj != null)
!                                       {
!                                               list[posn] = obj.ToString();
!                                       }
!                                       else
!                                       {
!                                               list[posn] = null;
!                                       }
!                                       ++posn;
!                               }
!                               return Concat(list);
                        }
  #endif

Index: Type.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Type.cs,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** Type.cs     22 Apr 2003 12:17:29 -0000      1.21
--- Type.cs     23 Apr 2003 05:39:48 -0000      1.22
***************
*** 27,31 ****
--- 27,35 ----
  using System.Collections;
  using System.Runtime.CompilerServices;
+ using System.Runtime.InteropServices;
  
+ #if !ECMA_COMPAT
+ [ClassInterface(ClassInterfaceType.AutoDual)]
+ #endif
  public abstract class Type
  #if CONFIG_REFLECTION

Index: TypedReference.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/TypedReference.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** TypedReference.cs   22 Apr 2003 12:17:29 -0000      1.5
--- TypedReference.cs   23 Apr 2003 05:39:48 -0000      1.6
***************
*** 2,6 ****
   * TypedReference.cs - Implementation of the "System.TypedReference" class.
   *
!  * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * TypedReference.cs - Implementation of the "System.TypedReference" class.
   *
!  * Copyright (C) 2001, 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 27,30 ****
--- 27,31 ----
  using System.Runtime.CompilerServices;
  
+ [CLSCompliant(false)]
  #if ECMA_COMPAT
  internal
***************
*** 100,103 ****
--- 101,105 ----
  
        // Set the value within a typed reference.
+       [CLSCompliant(false)]
        public static void SetTypedReference(TypedReference target, Object 
value)
                        {

Index: _AppDomain.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/_AppDomain.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** _AppDomain.cs       17 Apr 2003 10:36:07 -0000      1.4
--- _AppDomain.cs       23 Apr 2003 05:39:48 -0000      1.5
***************
*** 38,42 ****
  #else
  [CLSCompliant(false)]
! [Guid("")]
  [InterfaceType(ComInterfaceType.InterfaceIsDual)]
  public
--- 38,42 ----
  #else
  [CLSCompliant(false)]
! [Guid("05F696DC-2B29-3663-AD8B-C4389CF2A713")]
  [InterfaceType(ComInterfaceType.InterfaceIsDual)]
  public





reply via email to

[Prev in Thread] Current Thread [Next in Thread]