From 55eb97e9c519a655444108e15e82ca89289e1c8d Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Sat, 19 Jul 2014 18:08:46 +0200 Subject: [PATCH] C++, actually add 'virtual' to output, and fix missing rename. --- sphinx/domains/cpp.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index c608ad54e..49c843d68 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -867,7 +867,7 @@ class DefinitionParser(object): volatile=self.skip_word_and_ws('volatile'), noexcept=self.skip_word_and_ws('noexcept'), override=self.skip_word_and_ws('override'), - pure_virtual=False, + pure=False, lvalue_this=False, rvalue_this=False, delete=False, @@ -1180,7 +1180,7 @@ class CPPFunctionObject(CPPObject): node += addnodes.desc_addname(' const', ' const') if func.noexcept: node += addnodes.desc_addname(' noexcept', ' noexcept') - if func.pure_virtual: + if func.pure: node += addnodes.desc_addname(' = 0', ' = 0') def get_index_text(self, name): @@ -1194,6 +1194,9 @@ class CPPFunctionObject(CPPObject): if func.explicit: signode += addnodes.desc_annotation('explicit', 'explicit') signode += nodes.Text(' ') + if func.virtual: + signode += addnodes.desc_annotation('virtual', 'virtual') + signode += nodes.Text(' ') # return value is None for things with a reverse return value # such as casting operator definitions or constructors # and destructors.