diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-12-17 16:16:52 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-17 16:16:52 (GMT) |
commit | d76b1ec4a5f009251dc6e4904454c9f40216e874 (patch) | |
tree | 3301ba7d9fa1b3c50ed0a9509b544ef0e8443880 | |
parent | 736557cabb38a37f12cb630adca9ef693646a980 (diff) | |
parent | d34236ba40379847ad4ee3140366bee37b652615 (diff) | |
download | Doxygen-d76b1ec4a5f009251dc6e4904454c9f40216e874.zip Doxygen-d76b1ec4a5f009251dc6e4904454c9f40216e874.tar.gz Doxygen-d76b1ec4a5f009251dc6e4904454c9f40216e874.tar.bz2 |
Merge pull request #8259 from utzig/callback-param
Add param validation to typedef function pointers
-rw-r--r-- | src/doxygen.cpp | 2 | ||||
-rw-r--r-- | src/memberdef.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index e246628..e2ab088 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -2351,7 +2351,7 @@ static MemberDef *addVariableToFile( type,name,args,0, root->protection, Normal,root->stat,Member, mtype,!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(), - ArgumentList(), root->metaData) }; + root->argList, root->metaData) }; md->setTagInfo(root->tagInfo()); md->setMemberSpecifiers(root->spec); md->setDocumentation(root->doc,root->docFile,root->docLine); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index ca6026e..ecc07d7 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -845,7 +845,7 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me const ArgumentList &defArgList=(md->isDocsForDefinition()) ? md->argumentList() : md->declArgumentList(); //printf("writeDefArgumentList '%s' isDocsForDefinition()=%d\n",md->name().data(),md->isDocsForDefinition()); - if (!defArgList.hasParameters() || md->isProperty()) + if (!defArgList.hasParameters() || md->isProperty() || md->isTypedef()) { return FALSE; // member has no function like argument list } |