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

@@ -24,7 +24,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_5
namespace System.IO.Compression {
public enum CompressionLevel {
Optimal,
@@ -32,4 +31,3 @@ namespace System.IO.Compression {
NoCompression
}
}
#endif

View File

@@ -80,7 +80,6 @@ namespace System.IO.Compression
this.leaveOpen = leaveOpen;
}
#if NET_4_5
public DeflateStream (Stream stream, CompressionLevel compressionLevel)
: this (stream, compressionLevel, false, false)
{
@@ -95,7 +94,6 @@ namespace System.IO.Compression
: this (stream, CompressionMode.Compress, leaveOpen, gzip)
{
}
#endif
protected override void Dispose (bool disposing)
{

View File

@@ -40,16 +40,15 @@ namespace System.IO.Compression {
{
private DeflateStream deflateStream;
public GZipStream (Stream compressedStream, CompressionMode mode) :
this (compressedStream, mode, false) {
public GZipStream (Stream stream, CompressionMode mode) :
this (stream, mode, false) {
}
public GZipStream (Stream compressedStream, CompressionMode mode, bool leaveOpen) {
this.deflateStream = new DeflateStream (compressedStream, mode, leaveOpen, true);
public GZipStream (Stream stream, CompressionMode mode, bool leaveOpen) {
this.deflateStream = new DeflateStream (stream, mode, leaveOpen, true);
}
#if NET_4_5
public GZipStream (Stream stream, CompressionLevel compressionLevel)
: this (stream, compressionLevel, false)
{
@@ -59,7 +58,6 @@ namespace System.IO.Compression {
{
this.deflateStream = new DeflateStream (stream, compressionLevel, leaveOpen, true);
}
#endif
protected override void Dispose (bool disposing)
{