[MSBuild] Fix minor assembly resolution issue

[mono.git] / mcs / class / corlib / System.IO / UnmanagedMemoryAccessor.cs

diff --git a/mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs b/mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs
index b4a3632d644e9611e74e7539f48a835fd52c82fb..feb7b4abc7f4a27b25235ae9f94b44b91ebed4bd 100644 (file)
--- a/mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs
+++ b/mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs
@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 
 using System;
 using System.Runtime.InteropServices;
@@ -35,9 +34,12 @@ using System.Security.Permissions;
 
 namespace System.IO
 {
+       [MonoTODO ("Offset is ignored")]
        public class UnmanagedMemoryAccessor : IDisposable {
                SafeBuffer buffer;
+#pragma warning disable 414
                long offset;
+#pragma warning restore
                long capacity;
                bool canwrite, canread;
 
@@ -64,8 +66,6 @@ namespace System.IO
                                throw new ArgumentOutOfRangeException ("offset");
                        if (capacity < 0)
                                throw new ArgumentOutOfRangeException ("capacity");
-                       if (offset + capacity < 0)
-                               throw new InvalidOperationException ();
 
                        if (access == FileAccess.Read || access == FileAccess.ReadWrite)
                                canread = true;
@@ -274,8 +274,8 @@ namespace System.IO
                                throw new ArgumentOutOfRangeException ();
                        
                        long left = capacity - position;
-                       var slots = (int)(left / Marshal.SizeOf (typeof (T)));
-                       
+                       var slots = Math.Min (count, (int)(left / Marshal.SizeOf (typeof (T))));
+
                        buffer.ReadArray ((ulong) position, array, offset, slots);
                        return slots;
                }
@@ -475,4 +475,3 @@ namespace System.IO
        }
 }
 
-#endif