From b035a256b64ca08d1b9f39b867835d3b5f6bf0f2 Mon Sep 17 00:00:00 2001 From: Mark Sturgill Date: Wed, 30 Oct 2013 12:26:51 -0700 Subject: [PATCH] remove mono conditionals that no longer seem to be necessary --- Scripts/Accounting/Accounts.cs | 4 ---- Scripts/Misc/Emitter.cs | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/Scripts/Accounting/Accounts.cs b/Scripts/Accounting/Accounts.cs index d79fd7a41..511fe5df1 100644 --- a/Scripts/Accounting/Accounts.cs +++ b/Scripts/Accounting/Accounts.cs @@ -24,11 +24,7 @@ namespace Server.Accounting public static ICollection GetAccounts() { -#if !MONO return m_Accounts.Values; -#else - return new List( m_Accounts.Values ); -#endif } public static IAccount GetAccount( string username ) diff --git a/Scripts/Misc/Emitter.cs b/Scripts/Misc/Emitter.cs index b5f83d07a..69639a575 100644 --- a/Scripts/Misc/Emitter.cs +++ b/Scripts/Misc/Emitter.cs @@ -495,15 +495,6 @@ namespace Server 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 ) { Type active = this.Active; @@ -535,16 +526,12 @@ namespace Server * Bleh. */ -#if MONO - Type[] ifaces = active.FindInterfaces( GenericComparator, active ); -#else Type[] ifaces = active.FindInterfaces( delegate( Type type, object obj ) { return ( type.IsGenericType ) && ( type.GetGenericTypeDefinition() == typeof( IComparable<> ) ) && ( type.GetGenericArguments()[0].IsAssignableFrom( active ) ); }, null ); -#endif if ( ifaces.Length > 0 ) {