summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-06-10 08:07:16 (GMT)
committerGitHub <noreply@github.com>2019-06-10 08:07:16 (GMT)
commit0272374c07ef027a6ed6c94bf2f68826a93230a9 (patch)
tree8bdcb622176766b21c3156f43d183d1ba490e680
parent8b090a65887519e8ba22d0225a023db3b64c5349 (diff)
parentef859cbf50b26457caee9bad26ed293951e70ce1 (diff)
downloadDoxygen-0272374c07ef027a6ed6c94bf2f68826a93230a9.zip
Doxygen-0272374c07ef027a6ed6c94bf2f68826a93230a9.tar.gz
Doxygen-0272374c07ef027a6ed6c94bf2f68826a93230a9.tar.bz2
Merge pull request #7041 from albert-github/feature/bug_warn_consistency
Consistency not generated inheritance diagram
-rw-r--r--src/classdef.cpp6
-rw-r--r--src/memberdef.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 8f04505..f7abbe4 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1718,7 +1718,11 @@ void ClassDefImpl::writeInheritanceGraph(OutputList &ol) const
// write class diagram using dot
{
DotClassGraph inheritanceGraph(this,DotNode::Inheritance);
- if (!inheritanceGraph.isTrivial() && !inheritanceGraph.isTooBig())
+ if (inheritanceGraph.isTooBig())
+ {
+ warn_uncond("Inheritance graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",name().data());
+ }
+ else if (!inheritanceGraph.isTrivial())
{
ol.pushGeneratorState();
ol.disable(OutputGenerator::Man);
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 3442229..912d7b2 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -2945,7 +2945,7 @@ void MemberDefImpl::_writeCallerGraph(OutputList &ol) const
{
warn_uncond("Caller graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",qPrint(qualifiedName()));
}
- else if (!callerGraph.isTrivial() && !callerGraph.isTooBig())
+ else if (!callerGraph.isTrivial())
{
msg("Generating caller graph for function %s\n",qPrint(qualifiedName()));
ol.disable(OutputGenerator::Man);