Exclude more console code from NET_2_1

[mono.git] / mcs / tools / monop / outline.cs

diff --git a/mcs/tools/monop/outline.cs b/mcs/tools/monop/outline.cs
index 784cece95b2cbd41f030192bbaecacd71d740879..63a006ac557327111dd3c718182f9c478e33ead9 100644 (file)
--- a/mcs/tools/monop/outline.cs
+++ b/mcs/tools/monop/outline.cs
@@ -29,6 +29,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System;
 using System.Reflection;
 using System.Collections;
@@ -88,9 +90,7 @@ public class Outline {
                        OutlineParams (method.GetParameters ());
                        o.Write (")");
 
-#if NET_2_0
                        WriteGenericConstraints (t.GetGenericArguments ());
-#endif                 
        
                        o.WriteLine (";"); 
                        return;
@@ -119,9 +119,9 @@ public class Outline {
                        if (underlyingType != typeof (int))
                                o.Write (" : {0}", FormatType (underlyingType));
                }
-#if NET_2_0
+
                WriteGenericConstraints (t.GetGenericArguments ());
-#endif         
+
                o.WriteLine (" {");
                o.Indent++;
 
@@ -382,15 +382,11 @@ public class Outline {
                }
 
                o.Write (mi.Name);
-#if NET_2_0
                o.Write (FormatGenericParams (mi.GetGenericArguments ()));
-#endif
                o.Write (" (");
                OutlineParams (mi.GetParameters ());
                o.Write (")");
-#if NET_2_0
                WriteGenericConstraints (mi.GetGenericArguments ());
-#endif
                o.Write (";");
        }
        
@@ -549,7 +545,6 @@ public class Outline {
                 }
        }
 
-#if NET_2_0
        string FormatGenericParams (Type [] args)
        {
                StringBuilder sb = new StringBuilder ();
@@ -565,7 +560,6 @@ public class Outline {
                sb.Append (">");
                return sb.ToString ();
        }
-#endif
 
        // TODO: fine tune this so that our output is less verbose. We need to figure
        // out a way to do this while not making things confusing.
@@ -665,9 +659,7 @@ public class Outline {
        void GetTypeName (StringBuilder sb, Type t)
        {
                sb.Append (RemoveGenericArity (t.Name));
-#if NET_2_0
                sb.Append (FormatGenericParams (t.GetGenericArguments ()));
-#endif
        }
 
        string GetFullName (Type t)
@@ -679,12 +671,10 @@ public class Outline {
 
        void GetFullName_recursed (StringBuilder sb, Type t, bool recursed)
        {
-#if NET_2_0
                if (t.IsGenericParameter) {
                        sb.Append (t.Name);
                        return;
                }
-#endif
 
                if (t.DeclaringType != null) {
                        GetFullName_recursed (sb, t.DeclaringType, true);
@@ -702,7 +692,6 @@ public class Outline {
                GetTypeName (sb, t);
        }
 
-#if NET_2_0
        void WriteGenericConstraints (Type [] args)
        {
 
@@ -758,7 +747,6 @@ public class Outline {
                        }
                }
        }
-#endif
  
        string OperatorFromName (string name)
        {
@@ -1022,3 +1010,5 @@ public class Comparer : IComparer  {
        }
 }
 }
+
+#endif
\ No newline at end of file