You've already forked linux-packaging-mono
Imported Upstream version 5.2.0.175
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
parent
4bdbaf4a88
commit
966bba02bb
@@ -105,14 +105,14 @@ namespace System.Xaml.Schema
|
||||
|
||||
static readonly char [] comma_or_parens = new char [] {',', '(', ')'};
|
||||
|
||||
public static bool TryParseList (string typeNameList, IXamlNamespaceResolver namespaceResolver, out IList<XamlTypeName> list)
|
||||
public static bool TryParseList (string typeNameList, IXamlNamespaceResolver namespaceResolver, out IList<XamlTypeName> result)
|
||||
{
|
||||
if (typeNameList == null)
|
||||
throw new ArgumentNullException ("typeNameList");
|
||||
if (namespaceResolver == null)
|
||||
throw new ArgumentNullException ("namespaceResolver");
|
||||
|
||||
list = null;
|
||||
result = null;
|
||||
int idx = 0;
|
||||
int parens = 0;
|
||||
XamlTypeName tn;
|
||||
@@ -153,7 +153,7 @@ namespace System.Xaml.Schema
|
||||
ret.Add (tn);
|
||||
}
|
||||
|
||||
list = ret;
|
||||
result = ret;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@@ -56,9 +56,9 @@ namespace System.Xaml.Schema
|
||||
public XamlType TargetType { get; private set; }
|
||||
|
||||
|
||||
public static bool operator == (XamlValueConverter<TConverterBase> left, XamlValueConverter<TConverterBase> right)
|
||||
public static bool operator == (XamlValueConverter<TConverterBase> converter1, XamlValueConverter<TConverterBase> converter2)
|
||||
{
|
||||
return IsNull (left) ? IsNull (right) : left.Equals (right);
|
||||
return IsNull (converter1) ? IsNull (converter2) : converter1.Equals (converter2);
|
||||
}
|
||||
|
||||
static bool IsNull (XamlValueConverter<TConverterBase> a)
|
||||
@@ -66,9 +66,9 @@ namespace System.Xaml.Schema
|
||||
return Object.ReferenceEquals (a, null);
|
||||
}
|
||||
|
||||
public static bool operator != (XamlValueConverter<TConverterBase> left, XamlValueConverter<TConverterBase> right)
|
||||
public static bool operator != (XamlValueConverter<TConverterBase> converter1, XamlValueConverter<TConverterBase> converter2)
|
||||
{
|
||||
return IsNull (left) ? !IsNull (right) : IsNull (right) || left.ConverterType != right.ConverterType || left.TargetType != right.TargetType || left.Name != right.Name;
|
||||
return IsNull (converter1) ? !IsNull (converter2) : IsNull (converter2) || converter1.ConverterType != converter2.ConverterType || converter1.TargetType != converter2.TargetType || converter1.Name != converter2.Name;
|
||||
}
|
||||
|
||||
public bool Equals (XamlValueConverter<TConverterBase> other)
|
||||
|
Reference in New Issue
Block a user