IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Nicer solution for the C++ fix

Browse Source
This commit is contained in:
Armin Ronacher 2010-05-30 22:18:16 +02:00
parent c950196a30
commit 528f305d96
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/domains/cpp.py
View File

@ -829,12 +829,8 @@ class CPPObject(ObjectDescription):
signode['first'] = (not self.names)
self.state.document.note_explicit_target(signode)
# XXX: why is objtype function? How to get to func?
typ = self.objtype
if typ == 'function':
typ = 'func'
self.env.domaindata['cpp']['objects'].setdefault(name,
(self.env.docname, typ, theid))
(self.env.docname, self.objtype, theid))
indextext = self.get_index_text(name)
if indextext:
@ -1069,7 +1065,7 @@ class CPPDomain(Domain):
if name not in self.data['objects']:
return None
obj = self.data['objects'][name]
if obj[1] != typ:
if obj[1] not in self.objtypes_for_role(typ):
return None
return make_refnode(builder, fromdocname, obj[0], obj[2],
contnode, name)