diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-05-10 13:46:58 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-10 13:46:58 (GMT) |
commit | 88d719772661f5209cde4a7e07e947a7e5f7301d (patch) | |
tree | c2be62ebc88b0c26407a652b985afc1d9c1c522f | |
parent | 057b8f281c95b8da56b8f2aea815bd2eff72f59c (diff) | |
parent | dface804388013579f408d0baf01aa2739993317 (diff) | |
download | Doxygen-88d719772661f5209cde4a7e07e947a7e5f7301d.zip Doxygen-88d719772661f5209cde4a7e07e947a7e5f7301d.tar.gz Doxygen-88d719772661f5209cde4a7e07e947a7e5f7301d.tar.bz2 |
Merge pull request #7703 from elrond79/set_defname_if_not_proto
make declArgumentList be from declaration, and argumentList from definition
-rw-r--r-- | src/doxygen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index efd8294..6c4a19c 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -3447,7 +3447,7 @@ static void buildFunctionList(const Entry *root) { // merge argument lists ArgumentList mergedArgList = root->argList; - mergeArguments(mdAl,mergedArgList,!root->doc.isEmpty()); + mergeArguments(mdAl,mergedArgList,!root->proto); // merge documentation if (md->documentation().isEmpty() && !root->doc.isEmpty()) { @@ -4956,7 +4956,7 @@ static void addMemberDocs(const Entry *root, { ArgumentList mergedAl = *al; //printf("merging arguments (1) docs=%d\n",root->doc.isEmpty()); - mergeArguments(mdAl,mergedAl,!root->doc.isEmpty()); + mergeArguments(mdAl,mergedAl,!root->proto); } else { @@ -4969,7 +4969,7 @@ static void addMemberDocs(const Entry *root, { //printf("merging arguments (2)\n"); ArgumentList mergedArgList = root->argList; - mergeArguments(mdAl,mergedArgList,!root->doc.isEmpty()); + mergeArguments(mdAl,mergedArgList,!root->proto); } } if (over_load) // the \overload keyword was used |