2009-11-02 Miguel de Icaza <miguel@novell.com>

[mono.git] / mcs / class / corlib / System.Text / CodePageEncoding.cs

diff --git a/mcs/class/corlib/System.Text/CodePageEncoding.cs b/mcs/class/corlib/System.Text/CodePageEncoding.cs
index 1a3c3f82cae914f12b40d9a69dada585643beb3c..36a19b4002e514bf54a19d758d5e74ac6b7c1d2e 100644 (file)
--- a/mcs/class/corlib/System.Text/CodePageEncoding.cs
+++ b/mcs/class/corlib/System.Text/CodePageEncoding.cs
@@ -90,11 +90,9 @@ namespace System.Text
                }
 
                private int codePage;
-#if NET_2_0
                private bool isReadOnly;
                private EncoderFallback encoderFallback;
                private DecoderFallback decoderFallback;
-#endif
                private Encoding realObject;
 
                private CodePageEncoding (SerializationInfo info, StreamingContext context)
@@ -104,7 +102,6 @@ namespace System.Text
 
                        this.codePage = (int) info.GetValue ("m_codePage", typeof (int));
 
-#if NET_2_0
                        try {
                                this.isReadOnly = (bool) info.GetValue ("m_isReadOnly", typeof (bool));
                                this.encoderFallback = (EncoderFallback) info.GetValue ("encoderFallback", typeof (EncoderFallback));
@@ -113,7 +110,6 @@ namespace System.Text
                                // .NET Framework 1.x has no fallbacks
                                this.isReadOnly = true;
                        }
-#endif
                }
 
                public void GetObjectData (SerializationInfo info, StreamingContext context)
@@ -126,13 +122,11 @@ namespace System.Text
                        if (this.realObject == null) {
                                Encoding encoding = Encoding.GetEncoding (this.codePage);
 
-#if NET_2_0
                                if (!this.isReadOnly) {
                                        encoding = (Encoding) encoding.Clone ();
                                        encoding.EncoderFallback = this.encoderFallback;
                                        encoding.DecoderFallback = this.decoderFallback;
                                }
-#endif
 
                                this.realObject = encoding;
                        }