summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-01-26 14:05:34 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-01-26 14:05:34 (GMT)
commit0e9da9fb27147c5685088019afd428a0aaa901fa (patch)
tree6600d9ebf2ecf2824475d495751e2f950417ee49 /src/classdef.cpp
parentbc7e6301e2d1474592f6cd6cc07624852d1b5016 (diff)
downloadDoxygen-0e9da9fb27147c5685088019afd428a0aaa901fa.zip
Doxygen-0e9da9fb27147c5685088019afd428a0aaa901fa.tar.gz
Doxygen-0e9da9fb27147c5685088019afd428a0aaa901fa.tar.bz2
Bug 722759 - Documentation for derived classes no longer has an "Additional Inherited Members" section after upgrading Doxygen from 1.8.3.1 to 1.8.6
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 419e387..c7f677a 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -3953,6 +3953,17 @@ int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom,
count+=ml2->numDecMembers();
//printf("-> ml2=%d\n",ml2->numDecMembers());
}
+ // also include grouped members that have their own section in the class (see bug 722759)
+ if (inheritedFrom && m_impl->memberGroupSDict)
+ {
+ MemberGroupSDict::Iterator mgli(*m_impl->memberGroupSDict);
+ MemberGroup *mg;
+ for (;(mg=mgli.current());++mgli)
+ {
+ count+=mg->countGroupedInheritedMembers(lt);
+ if (lt2!=1) count+=mg->countGroupedInheritedMembers((MemberListType)lt2);
+ }
+ }
static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB");
if (!inlineInheritedMembers) // show inherited members as separate lists
{