diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-04-22 14:52:32 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-04-22 14:52:32 (GMT) |
| commit | 2c72e1c70c71966c3453d195c441e1cb69195779 (patch) | |
| tree | 03d06ee113f4aa2f44cfefed8568f23c36ed2179 | |
| parent | fc553b0aa6669daab5e46e94c21d4d03dc1eb280 (diff) | |
| download | Doxygen-2c72e1c70c71966c3453d195c441e1cb69195779.zip Doxygen-2c72e1c70c71966c3453d195c441e1cb69195779.tar.gz Doxygen-2c72e1c70c71966c3453d195c441e1cb69195779.tar.bz2 | |
Fixed issue with counting member lists
| -rw-r--r-- | src/memberdef.cpp | 8 | ||||
| -rw-r--r-- | src/membergroup.cpp | 1 | ||||
| -rw-r--r-- | src/memberlist.cpp | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index a40441a..24257da 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -734,13 +734,13 @@ class MemberDefAliasImpl : public DefinitionAliasImpl, public MemberDef // non-const getters should not be called virtual ClassDef *getClassDef() - { err("non-const getClassDef() called on aliased member. Please report as a bug."); return 0; } + { err("non-const getClassDef() called on aliased member. Please report as a bug.\n"); return 0; } virtual FileDef *getFileDef() - { err("non-const getFileDef() called on aliased member. Please report as a bug."); return 0; } + { err("non-const getFileDef() called on aliased member. Please report as a bug.\n"); return 0; } virtual NamespaceDef* getNamespaceDef() - { err("non-const getNamespaceDef() called on aliased member. Please report as a bug."); return 0; } + { err("non-const getNamespaceDef() called on aliased member. Please report as a bug.\n"); return 0; } virtual GroupDef *getGroupDef() - { err("non-const getGroupDef() called on aliased member. Please report as a bug."); return 0; } + { err("non-const getGroupDef() called on aliased member. Please report as a bug.\n"); return 0; } virtual void setEnumBaseType(const QCString &type) {} virtual void setMemberType(MemberType t) {} diff --git a/src/membergroup.cpp b/src/membergroup.cpp index 71729c3..04689b4 100644 --- a/src/membergroup.cpp +++ b/src/membergroup.cpp @@ -158,6 +158,7 @@ void MemberGroup::addGroupedInheritedMembers(OutputList &ol,const ClassDef *cd, { MemberList ml(lt); ml.append(md); + ml.countDecMembers(); ml.writePlainDeclarations(ol,cd,0,0,0,inheritedFrom,inheritId); } } diff --git a/src/memberlist.cpp b/src/memberlist.cpp index 62bebf6..94bb916 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -415,7 +415,8 @@ void MemberList::writePlainDeclarations(OutputList &ol, static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); if (numDecMembers()==-1) { - err("MemberList::numDecMembers()==-1, so the members of this list have not been counted. Please report as a bug."); + err("MemberList::numDecMembers()==-1, so the members of this list have not been counted. Please report as a bug.\n"); + abort(); } if (numDecMembers()<=numDecEnumValues()) { @@ -737,7 +738,8 @@ void MemberList::writeDocumentation(OutputList &ol, { if (numDocMembers()==-1) { - err("MemberList::numDocMembers()==-1, so the members of this list have not been counted. Please report as a bug."); + err("MemberList::numDocMembers()==-1, so the members of this list have not been counted. Please report as a bug.\n"); + abort(); } if (numDocMembers()==0) return; |