summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Molodowitch <paul@molodowitch.com>2020-04-15 23:26:50 (GMT)
committerPaul Molodowitch <paul@molodowitch.com>2020-04-15 23:26:50 (GMT)
commitdface804388013579f408d0baf01aa2739993317 (patch)
tree565b1031abe22dc4d13793cd967a5ea4f7a3bcb5
parent341f860ab7ae3e5255891b0984bec8b36e7557ef (diff)
downloadDoxygen-dface804388013579f408d0baf01aa2739993317.zip
Doxygen-dface804388013579f408d0baf01aa2739993317.tar.gz
Doxygen-dface804388013579f408d0baf01aa2739993317.tar.bz2
try to make it so that argumentList is always from the definition
...whereas the declArgumentList is always from the declaration
-rw-r--r--src/doxygen.cpp6
1 files 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