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++, fix crash reported in #2536.

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2016-05-13 09:22:46 +09:00
parent 75b1b4c7c3
commit 12b83372ac
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -53,6 +53,7 @@ Bugs fixed
* The caption of figure is always put on center even if ``:align:`` was specified * The caption of figure is always put on center even if ``:align:`` was specified
* #2526: LaTeX writer crashes if the section having only images * #2526: LaTeX writer crashes if the section having only images
* #2522: Sphinx touches mo files under installed directory that caused permission error. * #2522: Sphinx touches mo files under installed directory that caused permission error.
* #2536: C++, fix crash when an immediately nested scope has the same name as the current scope.
Release 1.4.1 (released Apr 12, 2016) Release 1.4.1 (released Apr 12, 2016)

2
sphinx/domains/cpp.py
View File

@ -2587,7 +2587,7 @@ class Symbol(object):
s = s._find_named_symbol(identifier, templateParams, s = s._find_named_symbol(identifier, templateParams,
templateArgs, operator, templateArgs, operator,
templateShorthand=False, templateShorthand=False,
matchSelf=True) matchSelf=False)
if not s: if not s:
return None return None
return s return s