Ok, I need to pay more attention

haacked · haacked · commit bac9eedba391 · 2013-09-10T10:28:28.000-07:00
diff --git a/RestSharp/Deserializers/XmlDeserializer.cs b/RestSharp/Deserializers/XmlDeserializer.cs
@@ -263,7 +263,7 @@ private void Map(object x, XElement root)
 
 		private static bool TryGetFromString(string inputString, out object result, Type type)
 		{
-#if !SILVERLIGHT || WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE
 			var converter = TypeDescriptor.GetConverter(type);
 			if (converter.CanConvertFrom(typeof(string)))
 			{

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ private void Map(object x, XElement root)`
`263`	`263`
`264`	`264`	`private static bool TryGetFromString(string inputString, out object result, Type type)`
`265`	`265`	`{`
`266`		`-#if !SILVERLIGHT \|\| WINDOWS_PHONE`
	`266`	`+#if !SILVERLIGHT && !WINDOWS_PHONE`
`267`	`267`	`var converter = TypeDescriptor.GetConverter(type);`
`268`	`268`	`if (converter.CanConvertFrom(typeof(string)))`
`269`	`269`	`{`