From dface804388013579f408d0baf01aa2739993317 Mon Sep 17 00:00:00 2001 From: Paul Molodowitch Date: Wed, 15 Apr 2020 16:26:50 -0700 Subject: try to make it so that argumentList is always from the definition ...whereas the declArgumentList is always from the declaration --- src/doxygen.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 3ce19f4..7ac1b2b 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -3445,7 +3445,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()) { @@ -4969,7 +4969,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 { @@ -4982,7 +4982,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 -- cgit v0.12