Skip to content

Commit 0588c32

Browse files
committed
issue #10636 weird behavior with \hideinheritancegraph
When known also use the explicit set in case of a "merge" call.
1 parent 63e3225 commit 0588c32

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/doxygen.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3661,11 +3661,11 @@ static void buildFunctionList(const Entry *root)
36613661

36623662
md->addSectionsToDefinition(root->anchors);
36633663

3664-
md->mergeEnableCallGraph(root->callGraph);
3665-
md->mergeEnableCallerGraph(root->callerGraph);
3666-
md->mergeEnableReferencedByRelation(root->referencedByRelation);
3667-
md->mergeEnableReferencesRelation(root->referencesRelation);
3668-
md->mergeEnableInlineSource(root->inlineSource);
3664+
if (root->callGraphExplicitSet) md->mergeEnableCallGraph(root->callGraph);
3665+
if (root->callerGraphExplicitSet) md->mergeEnableCallerGraph(root->callerGraph);
3666+
if (root->referencedByRelationExplicitSet) md->mergeEnableReferencedByRelation(root->referencedByRelation);
3667+
if (root->referencesRelationExplicitSet) md->mergeEnableReferencesRelation(root->referencesRelation);
3668+
if (root->inlineSourceExplicitSet) md->mergeEnableInlineSource(root->inlineSource);
36693669
md->addQualifiers(root->qualifiers);
36703670

36713671
// merge ingroup specifiers
@@ -5209,11 +5209,11 @@ static void addMemberDocs(const Entry *root,
52095209
md->setRefItems(root->sli);
52105210
}
52115211

5212-
md->mergeEnableCallGraph(root->callGraph);
5213-
md->mergeEnableCallerGraph(root->callerGraph);
5214-
md->mergeEnableReferencedByRelation(root->referencedByRelation);
5215-
md->mergeEnableReferencesRelation(root->referencesRelation);
5216-
md->mergeEnableInlineSource(root->inlineSource);
5212+
if (root->callGraphExplicitSet) md->mergeEnableCallGraph(root->callGraph);
5213+
if (root->callerGraphExplicitSet) md->mergeEnableCallerGraph(root->callerGraph);
5214+
if (root->referencedByRelationExplicitSet) md->mergeEnableReferencedByRelation(root->referencedByRelation);
5215+
if (root->referencesRelationExplicitSet) md->mergeEnableReferencesRelation(root->referencesRelation);
5216+
if (root->inlineSourceExplicitSet) md->mergeEnableInlineSource(root->inlineSource);
52175217
md->addQualifiers(root->qualifiers);
52185218

52195219
md->mergeMemberSpecifiers(spec);

0 commit comments

Comments
 (0)