diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-21 13:56:26 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-21 13:56:26 (GMT) |
| commit | 369c65635de29af6fd92c835879d70fdac7d2270 (patch) | |
| tree | 36f029e47882989a3f49c780f3aaf19e48e82014 /src | |
| parent | 3e683bcfbb68acea59460423c8205e434712905f (diff) | |
| download | Doxygen-369c65635de29af6fd92c835879d70fdac7d2270.zip Doxygen-369c65635de29af6fd92c835879d70fdac7d2270.tar.gz Doxygen-369c65635de29af6fd92c835879d70fdac7d2270.tar.bz2 | |
issue 3417: C++: friend template functions shown even with HIDE_FRIEND_COMPOUNDS=yes
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.xml | 2 | ||||
| -rw-r--r-- | src/memberdef.cpp | 23 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/config.xml b/src/config.xml index dfe22e2..bf74fff 100644 --- a/src/config.xml +++ b/src/config.xml @@ -927,7 +927,7 @@ Go to the <a href="commands.html">next</a> section or return to the <docs> <![CDATA[ If the \c HIDE_FRIEND_COMPOUNDS tag is set to \c YES, doxygen will hide all - friend (class|struct|union) declarations. + friend declarations. If set to \c NO, these declarations will be included in the documentation. ]]> diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 239d614..99ed224 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2145,11 +2145,11 @@ bool MemberDefImpl::isBriefSectionVisible() const // Hide friend (class|struct|union) declarations if HIDE_FRIEND_COMPOUNDS is true bool visibleIfFriendCompound = !(hideFriendCompounds && - isFriend() && + isFriend() /*&& (m_impl->type=="friend class" || m_impl->type=="friend struct" || m_impl->type=="friend union" - ) + )*/ ); // only include members that are non-private unless EXTRACT_PRIVATE is @@ -2719,11 +2719,11 @@ bool MemberDefImpl::isDetailedSectionLinkable() const // hide friend (class|struct|union) member if HIDE_FRIEND_COMPOUNDS // is true bool friendCompoundFilter = !(Config_getBool(HIDE_FRIEND_COMPOUNDS) && - isFriend() && + isFriend() /*&& (m_impl->type=="friend class" || m_impl->type=="friend struct" || m_impl->type=="friend union" - ) + )*/ ); @@ -4187,13 +4187,6 @@ void MemberDefImpl::warnIfUndocumentedParams() const } } -bool MemberDefImpl::isFriendClass() const -{ - return (isFriend() && - (m_impl->type=="friend class" || m_impl->type=="friend struct" || - m_impl->type=="friend union")); -} - bool MemberDefImpl::isDocumentedFriendClass() const { ClassDef *fcd=0; @@ -6135,6 +6128,14 @@ bool MemberDefImpl::isFriendToHide() const return isFriendToHide; } +bool MemberDefImpl::isFriendClass() const +{ + return (isFriend() && + (m_impl->type=="friend class" || m_impl->type=="friend struct" || + m_impl->type=="friend union")); +} + + bool MemberDefImpl::isNotFriend() const { return !(isFriend() && isFriendToHide()); |