Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Kumpera <kumpera@gmail.com>2013-01-14 23:58:35 +0400
committerRodrigo Kumpera <kumpera@gmail.com>2013-02-11 22:01:10 +0400
commitde71901cf87c8b7fffab6b183f00418ed0cdc75f (patch)
treeea0f54a0108038c5b321d19cfaffa145b53ceab4 /mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
parent9b9effd98abff7d67923c52e040e697ee1a6900a (diff)
Kill the MOONLIGHT define in System.ServiceModel.Web.
Diffstat (limited to 'mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs')
-rw-r--r--mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
index fde0297a29c..9f10c3de8e5 100644
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
@@ -213,11 +213,7 @@ namespace System.ServiceModel.Dispatcher
case WebContentFormat.Json:
// FIXME: after name argument they are hack
if (json_serializer == null)
-#if MOONLIGHT
- json_serializer = new DataContractJsonSerializer (part.Type);
-#else
json_serializer = isWrapped ? new DataContractJsonSerializer (part.Type, BodyName ?? part.Name, null, 0x100000, false, null, true) : new DataContractJsonSerializer (part.Type);
-#endif
return json_serializer;
default:
throw new NotImplementedException (msgfmt.ToString ());