Facilitate the merge

diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs
index cd878db91b8cbee71a9011f2797808920549fda0..c9144904fa66d32b75d749b67abe61bb195a2d46 100644 (file)
--- 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);