From: Jb Evain <jbevain@gmail.com>
Date: Mon, 22 Nov 2010 23:28:22 +0000 (+0100)
Subject: Facilitate the merge
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=480893c953bab31c2cab100e3cf1f8fe72c37a91;p=mono.git

Facilitate the merge
---

diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs
index cd878db91b8..c9144904fa6 100644
--- a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs
+++ b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs
@@ -3472,7 +3472,7 @@ public abstract class MemberFormatter {
 
 		if (buf.Length != 0)
 			buf.Append (" ");
-		buf.Append (GetName (method.ReturnType)).Append (" ");
+		buf.Append (GetTypeName (method.MethodReturnType)).Append (" ");
 
 		AppendMethodName (buf, method);
 		AppendGenericMethod (buf, method).Append (" ");
@@ -3481,6 +3481,11 @@ public abstract class MemberFormatter {
 		return buf.ToString ();
 	}
 
+	protected virtual string GetTypeName (MethodReturnType returnType)
+	{
+		return GetName (returnType.ReturnType);
+	}
+
 	protected virtual StringBuilder AppendMethodName (StringBuilder buf, MethodDefinition method)
 	{
 		return buf.Append (method.Name);