2006-02-15 Martin Baulig <martin@ximian.com>

	* Type.cs (Type.IsGenericInstance): Removed.

svn path=/trunk/mcs/; revision=56899

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index d86ad55228545f2a239d123e75f9b6c8f7038fe7..2b309e9d98e019ed138838445081ef0f73590b7e 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-15  Martin Baulig  <martin@ximian.com>
+
+       * Type.cs (Type.IsGenericInstance): Removed.
+
 2006-02-14  Ankit Jain  <jankit@novell.com>
            Raja R Harinath  <rharinath@novell.com>
  

diff --git a/mcs/class/corlib/System/Exception.cs b/mcs/class/corlib/System/Exception.cs
index 76f906d6c2ff16c1effd143a33cd7a8c4eac38bd..7bcfecbd64aa4a82be803570b92683d946fc2772 100644 (file)
--- a/mcs/class/corlib/System/Exception.cs
+++ b/mcs/class/corlib/System/Exception.cs
@@ -315,7 +315,7 @@ namespace System
 
                        string generic = "";
 #if NET_2_0 || BOOTSTRAP_NET_2_0
-                       if (mi.HasGenericParameters) {
+                       if (mi.IsGenericMethod) {
                                Type[] gen_params = mi.GetGenericArguments ();
                                generic = "[";
                                for (int j = 0; j < gen_params.Length; j++) {

diff --git a/mcs/class/corlib/System/Nullable.cs b/mcs/class/corlib/System/Nullable.cs
index f7d7a715d535fd5fc5494f6835b890938e070071..6f9e0cf75a04d69a29c238983428a3748b4daa27 100644 (file)
--- a/mcs/class/corlib/System/Nullable.cs
+++ b/mcs/class/corlib/System/Nullable.cs
@@ -62,7 +62,7 @@ namespace System {
                {
                        if (nullableType == null)
                                throw new ArgumentNullException ("nullableType");
-                       if (nullableType.IsGenericInstance && nullableType.GetGenericTypeDefinition () == typeof (Nullable<>))
+                       if (nullableType.IsGenericType && nullableType.GetGenericTypeDefinition () == typeof (Nullable<>))
                                return nullableType.GetGenericArguments ()[0];
                        else
                                return null;

diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs
index 0d8a3d2f0f82197136114d9cc5aa2fbc069469a1..b0d4636c11bfad8402565c6838ab91d3deb2be64 100644 (file)
--- a/mcs/class/corlib/System/Type.cs
+++ b/mcs/class/corlib/System/Type.cs
@@ -1117,11 +1117,6 @@ namespace System {
                        return res;
                }
 
-               public extern bool IsGenericInstance {
-                       [MethodImplAttribute(MethodImplOptions.InternalCall)]
-                       get;
-               }
-
                public virtual extern bool IsGenericType {
                        [MethodImplAttribute(MethodImplOptions.InternalCall)]
                        get;