Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -31,10 +31,8 @@
using System.Globalization;
using System.IO;
using System.Runtime.InteropServices;
#if NET_4_5
using System.Threading;
using System.Threading.Tasks;
#endif
namespace System.Security.Cryptography {
@ -357,13 +355,10 @@ namespace System.Security.Cryptography {
}
}
#if NET_4_0
public bool HasFlushedFinalBlock {
get { return _flushedFinalBlock; }
}
#endif
#if NET_4_5
public override Task FlushAsync (CancellationToken cancellationToken)
{
return base.FlushAsync (cancellationToken);
@ -378,6 +373,5 @@ namespace System.Security.Cryptography {
{
return base.WriteAsync (buffer, offset, count, cancellationToken);
}
#endif
}
}