diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-02 18:44:43 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-02 18:44:43 (GMT) |
| commit | 8fea20a26d2b4994708556028bcf26b582146836 (patch) | |
| tree | 06046752229940a141018050b8fe2af1883d50a1 | |
| parent | bfe598c49fb7c99c93c84b7fcd7ea8ae8bb00739 (diff) | |
| download | Doxygen-8fea20a26d2b4994708556028bcf26b582146836.zip Doxygen-8fea20a26d2b4994708556028bcf26b582146836.tar.gz Doxygen-8fea20a26d2b4994708556028bcf26b582146836.tar.bz2 | |
Fixed issue when testing on ceph code regarding calling aliased members
| -rw-r--r-- | src/doxygen.cpp | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index c86eeac..b195715 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -6224,16 +6224,19 @@ static void findMember(const Entry *root, MemberDef *rmd_found = 0; for (const auto &rmd : *mn) { - const ArgumentList &rmdAl = rmd->argumentList(); - - newMember= - className!=rmd->getOuterScope()->name() || - !matchArguments2(rmd->getOuterScope(),rmd->getFileDef(),&rmdAl, - cd,fd,&root->argList, - TRUE); - if (!newMember) + if (!rmd->isAlias()) { - rmd_found = rmd.get(); + const ArgumentList &rmdAl = rmd->argumentList(); + + newMember= + className!=rmd->getOuterScope()->name() || + !matchArguments2(rmd->getOuterScope(),rmd->getFileDef(),&rmdAl, + cd,fd,&root->argList, + TRUE); + if (!newMember) + { + rmd_found = rmd.get(); + } } } if (rmd_found) // member already exists as rmd -> add docs @@ -6320,17 +6323,20 @@ static void findMember(const Entry *root, const MemberDef *rmd_found=0; for (const auto &rmd : *rmn) { - const ArgumentList &rmdAl = rmd->argumentList(); - // check for matching argument lists - if ( - matchArguments2(rmd->getOuterScope(),rmd->getFileDef(),&rmdAl, - cd,fd,&root->argList, - TRUE) - ) + if (!rmd->isAlias()) { - found=TRUE; - rmd_found = rmd.get(); - break; + const ArgumentList &rmdAl = rmd->argumentList(); + // check for matching argument lists + if ( + matchArguments2(rmd->getOuterScope(),rmd->getFileDef(),&rmdAl, + cd,fd,&root->argList, + TRUE) + ) + { + found=TRUE; + rmd_found = rmd.get(); + break; + } } } if (rmd_found) // member found -> copy line number info |