C++, fix crash reported in #2536.

Author: jakobandersen

CHANGES

@@ -53,6 +53,7 @@ Bugs fixed
 * The caption of figure is always put on center even if ``:align:`` was specified
 * #2526: LaTeX writer crashes if the section having only images
 * #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)

sphinx/domains/cpp.py

@@ -2587,7 +2587,7 @@ def direct_lookup(self, key):
             s = s._find_named_symbol(identifier, templateParams,
                                      templateArgs, operator,
                                      templateShorthand=False,
-                                     matchSelf=True)
+                                     matchSelf=False)
             if not s:
                 return None
         return s