2002-06-26 Martin Baulig <martin@gnome.org>

	* DecimalFormatter.cs: Removed MSTEST stuff, use `System',
	not `S = System'.  This file now compiles with mcs.

	* String.cs: Removed the already ifdef-outed __arglist Concat function
	to make it compile with mcs.

svn path=/trunk/mcs/; revision=5466

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 7e45498bb7d457b421113ae1c188b6c154622324..9e4219b3715e0c54d207db7d8c26e412712ff87b 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-26  Martin Baulig  <martin@gnome.org>
+
+       * DecimalFormatter.cs: Removed MSTEST stuff, use `System',
+       not `S = System'.  This file now compiles with mcs.
+
+       * String.cs: Removed the already ifdef-outed __arglist Concat function
+       to make it compile with mcs.
+
 2002-06-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * IntegerFormatter.cs:

diff --git a/mcs/class/corlib/System/DecimalFormatter.cs b/mcs/class/corlib/System/DecimalFormatter.cs
index 4003b91adfa6ef24d9d58d7e1947b7dda61f7e50..7ad4bddb818d4d124ebb69a72f3077a4c57b53c5 100644 (file)
--- a/mcs/class/corlib/System/DecimalFormatter.cs
+++ b/mcs/class/corlib/System/DecimalFormatter.cs
@@ -12,7 +12,7 @@
 
 using System.Globalization;
 using System.Text;
-using S = System;  // only used for switching test implementation\r
+using System;
 
 namespace System \r
 {
@@ -53,7 +53,7 @@ namespace System
             return true;
         }       
 
-        public static string NumberToString(string format, NumberFormatInfo nfi, S.Decimal value)\r
+        public static string NumberToString(string format, NumberFormatInfo nfi, Decimal value)\r
         {
             char specifier;\r
             int precision;\r
@@ -91,9 +91,8 @@ namespace System
             // get digit string\r
             const int bufSize = 40;\r
             int decPos = 0, sign = 0;\r
-#if !MSTEST\r
             char[] buf = new char[bufSize];\r
-            if (S.Decimal.decimal2string(ref value, digits, decimals, buf, bufSize, out decPos, out sign) != 0) \r
+            if (Decimal.decimal2string(ref value, digits, decimals, buf, bufSize, out decPos, out sign) != 0) \r
             {\r
                 throw new FormatException(); // should never happen \r
             }\r
@@ -101,13 +100,6 @@ namespace System
                string TempString = new String(buf);
                TempString = TempString.Trim(new char[] {(char)0x0});
                StringBuilder sb = new StringBuilder(TempString, TempString.Length);\r
-#else\r
-            StringBuilder sb = new StringBuilder(bufSize);\r
-            if (S.Decimal.decimal2string(ref value, digits, decimals, sb, bufSize, out decPos, out sign) != 0) \r
-            {\r
-                throw new FormatException(); // should never happen \r
-            }\r
-#endif\r
 \r
            if (sb.ToString () == String.Empty && decPos > 0 && sign == 0)
                    sb.Append ('0');

diff --git a/mcs/class/corlib/System/String.cs b/mcs/class/corlib/System/String.cs
index fab78b71c7cb814d960fbddf3c5f48b1b4384bac..a75f521877fae7d628bf6e7ade8b2157919e29e3 100644 (file)
--- a/mcs/class/corlib/System/String.cs
+++ b/mcs/class/corlib/System/String.cs
@@ -699,16 +699,6 @@ namespace System {
                        return Concat(obj1.ToString(), obj2.ToString(), obj3.ToString());
                }
 
-               //
-               // I can not find the "__arglist" argument on the spec
-               //
-#if !__MonoCS__
-               [CLSCompliant(false)]
-               public static String Concat (Object arg0, Object arg1, Object arg2, Object arg3, __arglist) {
-                       throw new NotImplementedException();
-               }
-#endif
-
                public static String Concat(String s1, String s2) {
                        if (null == s1) {
                                if (null == s2) { return String.Empty; }