summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2008-04-20 08:30:56 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2008-04-20 08:30:56 (GMT)
commitb4f20f70abd663b3d8e5889e1fe582dfe980b7a2 (patch)
tree1ef12f6f2f4d51d8e4486b2d467e6f047ef9515a /src/memberdef.cpp
parentc6c19d2984bfd7265b6d5f82336c991ec35727da (diff)
downloadDoxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.zip
Doxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.tar.gz
Doxygen-b4f20f70abd663b3d8e5889e1fe582dfe980b7a2.tar.bz2
Release-1.5.5-20080420
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 8a5a887..2180bb9 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -533,8 +533,8 @@ void MemberDefImpl::init(Definition *def,
{
declArgList = new ArgumentList;
stringToArgumentList(args,declArgList,&extraTypeChars);
- //printf("setDeclArgList %s to %p const=%d\n",args.data(),
- // declArgList,declArgList->constSpecifier);
+ //printf("setDeclArgList %s to %s const=%d\n",args.data(),
+ // argListToString(declArgList).data(),declArgList->constSpecifier);
}
else
{
@@ -766,7 +766,10 @@ QCString MemberDef::anchor() const
QCString result=m_impl->anc;
if (m_impl->groupAlias) return m_impl->groupAlias->anchor();
if (m_impl->templateMaster) return m_impl->templateMaster->anchor();
- if (m_impl->enumScope) result.prepend(m_impl->enumScope->anchor());
+ if (m_impl->enumScope && m_impl->enumScope!=this) // avoid recursion for C#'s public enum E { E, F }
+ {
+ result.prepend(m_impl->enumScope->anchor());
+ }
if (m_impl->group)
{
if (m_impl->groupMember)
@@ -1047,9 +1050,10 @@ bool MemberDef::isBriefSectionVisible() const
//printf("visibleIfStatic=%d visibleIfDocumented=%d visibleIfEnabled=%d "
// "visibleIfPrivate=%d visibltIfNotDefaultCDTor=%d "
- // "visibleIfFriendCompound=%d\n",visibleIfStatic,visibleIfDocumented,
+ // "visibleIfFriendCompound=%d !annScope=%d\n",
+ // visibleIfStatic,visibleIfDocumented,
// visibleIfEnabled,visibleIfPrivate,visibleIfNotDefaultCDTor,
- // visibleIfFriendCompound);
+ // visibleIfFriendCompound,!m_impl->annScope);
bool visible = visibleIfStatic && visibleIfDocumented &&
visibleIfEnabled && visibleIfPrivate &&