summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/config.xml2
-rw-r--r--src/memberdef.cpp23
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());