diff options
| author | Georg Brandl <georg@python.org> | 2014-09-22 14:51:47 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-09-22 14:51:47 +0200 |
| commit | 31452fc64d550f526d3a6c4dfbb1121873896503 (patch) | |
| tree | 1b259d36d3f105e8b0971acb1f838f89110595e1 /sphinx/domains/cpp.py | |
| parent | 905cbf853d5fe8fa911ec8fc81dc31134f4e5ba2 (diff) | |
| download | sphinx-git-31452fc64d550f526d3a6c4dfbb1121873896503.tar.gz | |
[WIP] parallel read
Diffstat (limited to 'sphinx/domains/cpp.py')
| -rw-r--r-- | sphinx/domains/cpp.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index 10dd61a7e..d4455a222 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -1836,6 +1836,12 @@ class CPPDomain(Domain): if data[0] == docname: del self.data['objects'][fullname] + def merge_domaindata(self, docnames, otherdata): + # XXX check duplicates + for fullname, data in otherdata['objects'].items(): + if data[0] in docnames: + self.data['objects'][fullname] = data + def _resolve_xref_inner(self, env, fromdocname, builder, target, node, contnode, warn=True): def _create_refnode(nameAst): |