diff options
| author | Sebastien Pouliot <sebastien@xamarin.com> | 2014-01-14 19:10:35 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@xamarin.com> | 2014-01-14 19:10:35 +0400 |
| commit | 439b2917d9fa5992208e144b37e2e82e5b890a1e (patch) | |
| tree | 9ce6c1e54f5f53cfe0f5f8be2514e5bb4711cc22 /mcs/class | |
| parent | f83814bfbbed3457070865ddff0bc5f5b1b9aaec (diff) | |
There's no need for those special NET_2_1 cases (excluding System.Char) anymore and it fixes 6 S.SM.W unit tests failures for XI.
Diffstat (limited to 'mcs/class')
2 files changed, 0 insertions, 4 deletions
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs index 5d255ac8446..87bd458413b 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs @@ -92,10 +92,8 @@ namespace System.ServiceModel.Dispatcher else if (parameter [0] != '"') return parameter; break; -#if !NET_2_1 case TypeCode.Char: return parameter != null ? Char.Parse (parameter): default (char); -#endif case TypeCode.SByte: return parameter != null ? SByte.Parse (parameter, CultureInfo.InvariantCulture): default (sbyte); case TypeCode.Byte: diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/QueryStringConverter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/QueryStringConverter.cs index 09752f05134..bb25332df44 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/QueryStringConverter.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/QueryStringConverter.cs @@ -74,10 +74,8 @@ namespace System.ServiceModel.Dispatcher switch (Type.GetTypeCode (parameterType)) { case TypeCode.String: return parameter; -#if !NET_2_1 case TypeCode.Char: return parameter != null ? Char.Parse (parameter) : default (char); -#endif case TypeCode.SByte: return parameter != null ? SByte.Parse (parameter, CultureInfo.InvariantCulture): default (sbyte); case TypeCode.Byte: |