warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove mono conditionals that no longer seem to be necessary

Browse source
This commit is contained in:
Mark Sturgill 2013-10-30 12:26:51 -07:00
parent ad5c172687
commit b035a256b6
2 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Accounting/Accounts.cs
View file

@ -24,11 +24,7 @@ namespace Server.Accounting
public static ICollection<IAccount> GetAccounts() public static ICollection<IAccount> GetAccounts()
{ {
#if !MONO
return m_Accounts.Values; return m_Accounts.Values;
#else
return new List<IAccount>( m_Accounts.Values );
#endif
} }
public static IAccount GetAccount( string username ) public static IAccount GetAccount( string username )

13
Scripts/Misc/Emitter.cs
View file

@ -495,15 +495,6 @@ namespace Server
public delegate void Callback(); public delegate void Callback();
#if MONO
private static bool GenericComparator( Type type, object obj )
{
return ( type.IsGenericType )
&& ( type.GetGenericTypeDefinition() == typeof( IComparable<> ) )
&& ( type.GetGenericArguments()[0].IsAssignableFrom(obj as Type) );
}
#endif
public bool CompareTo( int sign, Callback argGenerator ) public bool CompareTo( int sign, Callback argGenerator )
{ {
Type active = this.Active; Type active = this.Active;
@ -535,16 +526,12 @@ namespace Server
* Bleh. * Bleh.
*/ */
#if MONO
Type[] ifaces = active.FindInterfaces( GenericComparator, active );
#else
Type[] ifaces = active.FindInterfaces( delegate( Type type, object obj ) Type[] ifaces = active.FindInterfaces( delegate( Type type, object obj )
{ {
return ( type.IsGenericType ) return ( type.IsGenericType )
&& ( type.GetGenericTypeDefinition() == typeof( IComparable<> ) ) && ( type.GetGenericTypeDefinition() == typeof( IComparable<> ) )
&& ( type.GetGenericArguments()[0].IsAssignableFrom( active ) ); && ( type.GetGenericArguments()[0].IsAssignableFrom( active ) );
}, null ); }, null );
#endif
if ( ifaces.Length > 0 ) if ( ifaces.Length > 0 )
{ {