summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-08-21 13:51:26 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-08-21 13:51:26 (GMT)
commitd969219b8d2da6b932299b4f1e6edb98746206ef (patch)
tree3bdb3642ff793724c2b489a7fa484e5ce472d8a1
parent54bf87c789173c6a7af319a7a9c96ba200fcb683 (diff)
downloadDoxygen-d969219b8d2da6b932299b4f1e6edb98746206ef.zip
Doxygen-d969219b8d2da6b932299b4f1e6edb98746206ef.tar.gz
Doxygen-d969219b8d2da6b932299b4f1e6edb98746206ef.tar.bz2
Fixed regression when nested class were processed before their parent
-rw-r--r--src/doxygen.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 9ea2193..14d34c0 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1293,11 +1293,13 @@ static void addClassToContext(EntryNav *rootNav)
{
tagName = rootNav->tagInfo()->tagName;
refFileName = rootNav->tagInfo()->fileName;
- }
- int i;
- if ((i=fullName.find("::"))!=-1)
- {
- buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang);
+ int i;
+ if ((i=fullName.find("::"))!=-1)
+ // symbols imported via tag files may come without the parent scope,
+ // so we artificially create it here
+ {
+ buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang);
+ }
}
cd=new ClassDef(root->fileName,root->startLine,root->startColumn,
fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum);