summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-03-12 14:51:23 (GMT)
committerGitHub <noreply@github.com>2019-03-12 14:51:23 (GMT)
commit1ea163ff9386266ef6ed6ad68773c29ae814dca2 (patch)
treeaa6d6d65a435a160584233856628914ee53ab05c
parent4cef14ae4ca37133a39b9ad5d800904e425fef73 (diff)
parent50fcec52571ad447c814377a7f5ac0454d60c5c9 (diff)
downloadDoxygen-1ea163ff9386266ef6ed6ad68773c29ae814dca2.zip
Doxygen-1ea163ff9386266ef6ed6ad68773c29ae814dca2.tar.gz
Doxygen-1ea163ff9386266ef6ed6ad68773c29ae814dca2.tar.bz2
Merge pull request #6883 from albert-github/feature/issue_6882
issue #6882 1.8.15 regression: caller graph created even though CALLER_GRAPH = NO
-rw-r--r--src/memberdef.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index a73975d..995901a 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -5572,9 +5572,9 @@ void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
mdec->enableCallerGraph(mdec->hasCallerGraph() || mdef->hasCallerGraph());
mdef->enableReferencedByRelation(mdec->hasReferencedByRelation() || mdef->hasReferencedByRelation());
- mdef->enableCallerGraph(mdec->hasReferencesRelation() || mdef->hasReferencesRelation());
+ mdef->enableReferencesRelation(mdec->hasReferencesRelation() || mdef->hasReferencesRelation());
mdec->enableReferencedByRelation(mdec->hasReferencedByRelation() || mdef->hasReferencedByRelation());
- mdec->enableCallerGraph(mdec->hasReferencesRelation() || mdef->hasReferencesRelation());
+ mdec->enableReferencesRelation(mdec->hasReferencesRelation() || mdef->hasReferencesRelation());
}
}
}