diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/classdef.cpp | 1 | ||||
| -rw-r--r-- | src/doxygen.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index c3a3160..7c46c3a 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -3406,6 +3406,7 @@ void ClassDefImpl::mergeMembers() { // merge the members in the base class of this inheritance branch first bClass->mergeMembers(); + if (bClass->getLanguage()==SrcLangExt_Python) continue; // python does not have member overloading, see issue 8480 const MemberNameInfoLinkedMap &srcMnd = bClass->memberNameInfoLinkedMap(); MemberNameInfoLinkedMap &dstMnd = m_impl->allMemberNameInfoLinkedMap; diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 5f8adc2..b9cee8d 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -7674,6 +7674,7 @@ static void computeMemberRelations() // qPrint(argListToString(mdAl)) // ); if ( + bmd->getLanguage()==SrcLangExt_Python || matchArguments2(bmd->getOuterScope(),bmd->getFileDef(),&bmdAl, md->getOuterScope(), md->getFileDef(), &mdAl, TRUE |