diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-06-13 19:38:27 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-06-13 19:38:27 (GMT) |
commit | 890943c3df4986b5810f40160731a1f4ee30ef2e (patch) | |
tree | 67438740f12516ad1453ea6ee2373eee371bfef7 /src/classdef.cpp | |
parent | 7bae1f4e7c1f7b38e205f158cc5cbe0e4b956b75 (diff) | |
parent | 527fa741a67b9bc34ef315ff0ff6f96bae726497 (diff) | |
download | Doxygen-890943c3df4986b5810f40160731a1f4ee30ef2e.zip Doxygen-890943c3df4986b5810f40160731a1f4ee30ef2e.tar.gz Doxygen-890943c3df4986b5810f40160731a1f4ee30ef2e.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r-- | src/classdef.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index fc7a62f..a7f24ed 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -518,7 +518,7 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef { return getCdAlias()->countInheritanceNodes(); } virtual int countMemberDeclarations(MemberListType lt,const ClassDef *inheritedFrom, int lt2,bool invert,bool showAlways,QPtrDict<void> *visitedClasses) const - { return countMemberDeclarations(lt,inheritedFrom,lt2,invert,showAlways,visitedClasses); } + { return getCdAlias()->countMemberDeclarations(lt,inheritedFrom,lt2,invert,showAlways,visitedClasses); } virtual void writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title, const char *subTitle=0,bool showInline=FALSE,const ClassDef *inheritedFrom=0, int lt2=-1,bool invert=FALSE,bool showAlways=FALSE, @@ -1720,7 +1720,11 @@ void ClassDefImpl::writeInheritanceGraph(OutputList &ol) const // write class diagram using dot { DotClassGraph inheritanceGraph(this,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); |