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

C++, adapt sphinx-doc/sphinx#3894 after merge to master

Browse Source 
Fixes sphinx-doc/sphinx#4082
This commit is contained in:
Jakob Lykke Andersen 2017-09-28 20:10:07 +02:00
parent 5cfefdf2c1
commit 447c54ae92
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sphinx/domains/cpp.py
View File

@ -5469,12 +5469,12 @@ class CPPDomain(Domain):
name = 'cpp'
label = 'C++'
object_types = {
'class': ObjType(l_('class'), 'class', 'type', 'typeOrConcept'),
'function': ObjType(l_('function'), 'function', 'func', 'type', 'typeOrConcept'),
'class': ObjType(l_('class'), 'class', 'type', 'identifier'),
'function': ObjType(l_('function'), 'function', 'func', 'type', 'identifier'),
'member': ObjType(l_('member'), 'member', 'var'),
'type': ObjType(l_('type'), 'type', 'typeOrConcept'),
'concept': ObjType(l_('concept'), 'concept', 'typeOrConcept'),
'enum': ObjType(l_('enum'), 'enum', 'type', 'typeOrConcept'),
'type': ObjType(l_('type'), 'type', 'identifier'),
'concept': ObjType(l_('concept'), 'concept', 'identifier'),
'enum': ObjType(l_('enum'), 'enum', 'type', 'identifier'),
'enumerator': ObjType(l_('enumerator'), 'enumerator')
}

6
tests/test_ext_intersphinx.py
View File

@ -232,12 +232,6 @@ def test_missing_reference_cppdomain(tempdir, app, status, warning):
' href="https://docs.python.org/index.html#cpp_foo_bar"'
' title="(in foo v2.0)"><code class="xref cpp cpp-class docutils literal">'
'<span class="pre">Bar</span></code></a>' in html)
# assert ('<a class="reference external"'
# ' href="https://docs.python.org/index.html#std"'
# ' title="(in foo v2.0)">std</a>' in html)
# assert ('<a class="reference external"'
# ' href="https://docs.python.org/index.html#std_uint8_t"'
# ' title="(in foo v2.0)">uint8_t</a>' in html)
def test_missing_reference_jsdomain(tempdir, app, status, warning):