From: Rico Tzschichholz Date: Fri, 30 Sep 2016 13:38:59 +0000 (+0200) Subject: Fix non-matching generic types of inferface implementations X-Git-Tag: 0.37.1~3^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d27185a90c2bafe3ebecf41d6f6d0d69dbcfcc3;p=thirdparty%2Fvala.git Fix non-matching generic types of inferface implementations --- diff --git a/src/libvaladoc/content/taglet.vala b/src/libvaladoc/content/taglet.vala index a8fc4f144..c492621a1 100644 --- a/src/libvaladoc/content/taglet.vala +++ b/src/libvaladoc/content/taglet.vala @@ -27,7 +27,7 @@ public interface Valadoc.Content.Taglet : ContentElement { public abstract Rule? get_parser_rule (Rule run_rule); - public virtual Gee.List? get_inheritable_documentation () { + public virtual Gee.List? get_inheritable_documentation () { return null; } diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala index 6e9aa43d4..d8b288545 100644 --- a/src/libvaladoc/taglets/tagletinheritdoc.vala +++ b/src/libvaladoc/taglets/tagletinheritdoc.vala @@ -188,13 +188,13 @@ public class Valadoc.Taglets.InheritDoc : InlineTaglet { comment.content.remove ((Paragraph) separator); } - private Run content_copy (Gee.List? content) { + private Run content_copy (Gee.List? content) { Run run = new Run (Run.Style.NONE); run.parent = this; if (content != null) { - foreach (Inline item in content) { - run.content.add ((Inline) item.copy (this)); + foreach (ContentElement item in content) { + run.content.add (item.copy (this) as Inline); } }