Author: duncan
Date: 2006-11-28 20:46:18 -0500 (Tue, 28 Nov 2006)
New Revision: 68632
Added:
trunk/mcs/class/corlib/System/InsufficientMemoryException.cs
Modified:
trunk/mcs/class/corlib/System.IO/ChangeLog
trunk/mcs/class/corlib/System.IO/TextReader.cs
trunk/mcs/class/corlib/System/ChangeLog
trunk/mcs/class/corlib/corlib.dll.sources
Log:
Fix 2.0 buglets exposed by the MOMA tool.
2006-11-28 Duncan Mak <[EMAIL PROTECTED]>
* TextReader.cs (Dispose): Expose as public in NET_2_0.
2006-11-28 Duncan Mak <[EMAIL PROTECTED]>
* ArgumentNullException.cs (.ctor): Added new constructor that's
new in .NET 2.0.
* InsufficientMemoryException.cs: Added missing 2.0 exception.
Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog 2006-11-29 00:34:09 UTC (rev
68631)
+++ trunk/mcs/class/corlib/System/ChangeLog 2006-11-29 01:46:18 UTC (rev
68632)
@@ -1,3 +1,10 @@
+2006-11-28 Duncan Mak <[EMAIL PROTECTED]>
+
+ * ArgumentNullException.cs (.ctor): Added new constructor that's
+ new in .NET 2.0.
+
+ * InsufficientMemoryException.cs: Added missing 2.0 exception.
+
2006-11-27 Jonathan Chambers <[EMAIL PROTECTED]>
* __ComObject.cs: Removed IDispatchMono.
Added: trunk/mcs/class/corlib/System/InsufficientMemoryException.cs
===================================================================
--- trunk/mcs/class/corlib/System/InsufficientMemoryException.cs
2006-11-29 00:34:09 UTC (rev 68631)
+++ trunk/mcs/class/corlib/System/InsufficientMemoryException.cs
2006-11-29 01:46:18 UTC (rev 68632)
@@ -0,0 +1,52 @@
+//
+// InsufficientMemoryException.cs
+//
+// Author: Duncan Mak ([EMAIL PROTECTED])
+//
+// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+#if NET_2_0
+namespace System {
+
+ [Serializable]
+ public sealed class InsufficientMemoryException : OutOfMemoryException
+ {
+ public InsufficientMemoryException ()
+ : base ("Insufficient memory")
+ {
+ }
+
+ public InsufficientMemoryException (string message)
+ : base (message)
+ {
+ }
+
+ public InsufficientMemoryException (string message, Exception
base_exception)
+ : base (message, base_exception)
+ {
+ }
+ }
+}
+#endif
\ No newline at end of file
Modified: trunk/mcs/class/corlib/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.IO/ChangeLog 2006-11-29 00:34:09 UTC (rev
68631)
+++ trunk/mcs/class/corlib/System.IO/ChangeLog 2006-11-29 01:46:18 UTC (rev
68632)
@@ -1,3 +1,7 @@
+2006-11-28 Duncan Mak <[EMAIL PROTECTED]>
+
+ * TextReader.cs (Dispose): Expose as public in NET_2_0.
+
2006-11-26 Miguel de Icaza <[EMAIL PROTECTED]>
* DriveInfo.cs, DriveType.cs: Add a couple of classes for
Modified: trunk/mcs/class/corlib/System.IO/TextReader.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/TextReader.cs 2006-11-29 00:34:09 UTC
(rev 68631)
+++ trunk/mcs/class/corlib/System.IO/TextReader.cs 2006-11-29 01:46:18 UTC
(rev 68632)
@@ -5,30 +5,30 @@
// Marcin Szczepanski ([EMAIL PROTECTED])
// Miguel de Icaza ([EMAIL PROTECTED])
//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
using System;
using System.Runtime.InteropServices;
@@ -46,7 +46,11 @@
Dispose(true);
}
+#if NET_2_0
+ public void Dispose ()
+#else
void System.IDisposable.Dispose()
+#endif
{
Dispose(true);
}
@@ -66,7 +70,7 @@
return -1;
}
-
+
public virtual int Read ([In, Out] char[] buffer, int index,
int count)
{
int c, i;
Modified: trunk/mcs/class/corlib/corlib.dll.sources
===================================================================
--- trunk/mcs/class/corlib/corlib.dll.sources 2006-11-29 00:34:09 UTC (rev
68631)
+++ trunk/mcs/class/corlib/corlib.dll.sources 2006-11-29 01:46:18 UTC (rev
68632)
@@ -155,6 +155,7 @@
System/IFormatProvider.cs
System/IFormattable.cs
System/IndexOutOfRangeException.cs
+System/InsufficientMemoryException.cs
System/Int16.cs
System/Int32.cs
System/Int64.cs
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
