diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-05-26 20:55:26 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-05-26 20:55:26 +0900 |
| commit | 2578f47664361b1b4c48fa1c7c3d01ade53eb32f (patch) | |
| tree | e08c18e47ac5a82e5604d3053cfb056f4b37a8e9 /sphinx/domains/cpp.py | |
| parent | 08cfcbc363d684510dff3b2ed628a88a0e4d729a (diff) | |
| parent | 2c351a1261a5eb414f0e03a4aa811ee798f79819 (diff) | |
| download | sphinx-git-2578f47664361b1b4c48fa1c7c3d01ade53eb32f.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'sphinx/domains/cpp.py')
| -rw-r--r-- | sphinx/domains/cpp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index 6306ac901..7d41d6570 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -2587,7 +2587,7 @@ class Symbol(object): s = s._find_named_symbol(identifier, templateParams, templateArgs, operator, templateShorthand=False, - matchSelf=True) + matchSelf=False) if not s: return None return s @@ -4100,7 +4100,7 @@ class CPPDomain(Domain): parser.assert_end() except DefinitionError as e: warner.warn('Unparseable C++ cross-reference: %r\n%s' - % (target, str(e.description))) + % (target, text_type(e.description))) return None, None parentKey = node.get("cpp:parent_key", None) rootSymbol = self.data['root_symbol'] |