diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-14 11:32:09 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-14 11:32:09 (GMT) |
commit | 90512d081e8fdce732f07b2e2e9f125870677128 (patch) | |
tree | 6947cb15535503aa5d01f28e519fd0aae41496e5 /src | |
parent | 63dedfa8d582995d363840ee2923bc66b0143a7a (diff) | |
download | Doxygen-90512d081e8fdce732f07b2e2e9f125870677128.zip Doxygen-90512d081e8fdce732f07b2e2e9f125870677128.tar.gz Doxygen-90512d081e8fdce732f07b2e2e9f125870677128.tar.bz2 |
Fixed regression that could cause double nested classes
Diffstat (limited to 'src')
-rw-r--r-- | src/doxygen.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 56aba70..15f1a35 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1295,21 +1295,15 @@ static void addClassToContext(EntryNav *rootNav) tagName = rootNav->tagInfo()->tagName; refFileName = rootNav->tagInfo()->fileName; } - Definition *d = 0; int i; if ((i=fullName.find("::"))!=-1) { - d = buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang); + buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang); } cd=new ClassDef(root->fileName,root->startLine,root->startColumn, fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum); Debug::print(Debug::Classes,0," New class `%s' (sec=0x%08x)! #tArgLists=%d\n", fullName.data(),sec,root->tArgLists ? (int)root->tArgLists->count() : -1); - if (d) - { - cd->setOuterScope(d); - d->addInnerCompound(cd); - } cd->setDocumentation(root->doc,root->docFile,root->docLine); // copy docs to definition cd->setBriefDescription(root->brief,root->briefFile,root->briefLine); cd->setLanguage(root->lang); |