Working to reduce number of conditional complication directives, and migrate towards feature-based condtions rather than platform-based

2 files changed, 0 insertions, 14 deletions

diff --git a/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs b/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs
index 4fe6ea7c..1c71dc95 100644
--- a/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs
+++ b/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs
@@ -100,11 +100,7 @@ namespace Google.ProtocolBuffers.Serialization
 

         private class JsonStreamWriter : JsonFormatWriter

         {

-#if SILVERLIGHT || COMPACT_FRAMEWORK

             static readonly Encoding Encoding = new UTF8Encoding(false);

-#else

-            private static readonly Encoding Encoding = Encoding.ASCII;

-#endif

             private readonly byte[] _buffer;

             private Stream _output;

             private int _bufferPos;

diff --git a/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs b/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs
index a2f683f7..14e72ba8 100644
--- a/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs
+++ b/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs
@@ -7,9 +7,6 @@ namespace Google.ProtocolBuffers.Serialization
     /// <summary>

     /// The exception raised when a recursion limit is reached while parsing input.

     /// </summary>

-#if !SILVERLIGHT && !COMPACT_FRAMEWORK

-    [Serializable]

-#endif

     public sealed class RecursionLimitExceededException : FormatException

     {

         const string message = "Possible malicious message had too many levels of nesting.";

@@ -17,12 +14,5 @@ namespace Google.ProtocolBuffers.Serialization
         internal RecursionLimitExceededException() : base(message)

         {

         }

-

-#if !SILVERLIGHT && !COMPACT_FRAMEWORK

-        private RecursionLimitExceededException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)

-            : base(info, context)

-        {

-        }

-#endif

     }

 }