diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-07 19:19:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 19:19:35 (GMT) |
| commit | 6f33807a19df2012a7d1eed8871510bc6dbd46b8 (patch) | |
| tree | 391b454cac1163635eab7d95413cfdc59c9bd384 | |
| parent | c7edc00776fccc54b3ad96b218df8843229a5002 (diff) | |
| parent | f006a57ab53437805fadbff5d9b1bca9978bed35 (diff) | |
| download | Doxygen-6f33807a19df2012a7d1eed8871510bc6dbd46b8.zip Doxygen-6f33807a19df2012a7d1eed8871510bc6dbd46b8.tar.gz Doxygen-6f33807a19df2012a7d1eed8871510bc6dbd46b8.tar.bz2 | |
Merge pull request #6970 from albert-github/feature/issue_6968
issue #6968 INLINE_INHERITED_MEMB doesn't respect EXTRACT_PRIVATE=NO
| -rw-r--r-- | src/classdef.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index 19c8fac..3a680c5 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -3646,7 +3646,8 @@ void ClassDefImpl::mergeMembers() m_impl->membersMerged=TRUE; //printf(" mergeMembers for %s\n",name().data()); - bool inlineInheritedMembers = Config_getBool(INLINE_INHERITED_MEMB); + static bool inlineInheritedMembers = Config_getBool(INLINE_INHERITED_MEMB); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); if (baseClasses()) { //printf(" => has base classes!\n"); @@ -3842,7 +3843,7 @@ void ClassDefImpl::mergeMembers() // name().data(),mi->memberDef->name().data(),mi->prot, // bcd->prot,prot); - if (mi->prot!=Private) + if (prot!=Private || extractPrivate) { Specifier virt=mi->virt; if (mi->virt==Normal && bcd->virt!=Normal) virt=bcd->virt; |