summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-08-26 14:15:46 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-08-26 14:15:46 (GMT)
commitc822eb3d9ce727dd69954661edcabcad479c1481 (patch)
tree9acee8d8d8b91289eb8173fd93a8f16891fc2a92 /src/doxygen.cpp
parent2f7902073680b977b74f3faeada95119ec767eb3 (diff)
downloadDoxygen-c822eb3d9ce727dd69954661edcabcad479c1481.zip
Doxygen-c822eb3d9ce727dd69954661edcabcad479c1481.tar.gz
Doxygen-c822eb3d9ce727dd69954661edcabcad479c1481.tar.bz2
Release-1.2.10
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index b0d7dab..f19f411 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -888,6 +888,7 @@ static void buildClassList(Entry *root)
cd->setTemplateArguments(tArgList);
cd->setProtection(root->protection);
cd->addSectionsToDefinition(root->anchors);
+ cd->setIsStatic(root->stat);
// file definition containing the class cd
cd->setBodySegment(root->bodyLine,root->endBodyLine);
@@ -2677,14 +2678,20 @@ static bool findTemplateInstanceRelation(Entry *root,
// search for new template instances caused by base classes of
// instanceClass
Entry *templateRoot = classEntries.find(templateClass->name());
+ if (templateRoot)
+ {
+ ArgumentList *templArgs = new ArgumentList;
+ stringToArgumentList(templSpec,templArgs);
+ findBaseClassesForClass(templateRoot,templateClass,instanceClass,
+ TemplateInstances,isArtificial,templArgs,templateNames);
- ArgumentList *templArgs = new ArgumentList;
- stringToArgumentList(templSpec,templArgs);
- findBaseClassesForClass(templateRoot,templateClass,instanceClass,
- TemplateInstances,isArtificial,templArgs,templateNames);
-
- findUsedClassesForClass(templateRoot,templateClass,instanceClass,
- isArtificial,templArgs,templateNames);
+ findUsedClassesForClass(templateRoot,templateClass,instanceClass,
+ isArtificial,templArgs,templateNames);
+ }
+ else
+ {
+ // TODO: what happened if we get here?
+ }
//Debug::print(Debug::Classes,0," Template instance %s : \n",instanceClass->name().data());
//ArgumentList *tl = templateClass->templateArguments();
@@ -7132,7 +7139,7 @@ void parseInput()
msg("Adding source references...\n");
addSourceReferences();
- msg("Adding todo/test/bug list item...\n");
+ msg("Adding todo/test/bug list items...\n");
addTodoTestBugReferences();
}