summaryrefslogtreecommitdiffstats
path: root/src/groupdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2003-10-05 18:49:14 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2003-10-05 18:49:14 (GMT)
commit089a5c16df9e08b8f38be4578c2e7cb5799fa9b2 (patch)
tree358599c9b5f7120aab981ab203f8581dc71962d0 /src/groupdef.cpp
parentf62ec1169d8f82ba7c44230f7666458244a96495 (diff)
downloadDoxygen-089a5c16df9e08b8f38be4578c2e7cb5799fa9b2.zip
Doxygen-089a5c16df9e08b8f38be4578c2e7cb5799fa9b2.tar.gz
Doxygen-089a5c16df9e08b8f38be4578c2e7cb5799fa9b2.tar.bz2
Release-1.3.4-20031005
Diffstat (limited to 'src/groupdef.cpp')
-rw-r--r--src/groupdef.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 0f87ab8..e2e1940 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -198,6 +198,7 @@ bool GroupDef::insertMember(MemberDef *md,bool docOnly)
for ( ; (srcMi=srcMnii.current()) ; ++srcMnii )
{
MemberDef *srcMd = srcMi->memberDef;
+ if (srcMd==md) return FALSE; // already added before!
bool sameScope = srcMd->getOuterScope()==md->getOuterScope() || // same class or namespace
// both inside a file => definition and declaration do not have to be in the same file
@@ -208,8 +209,15 @@ bool GroupDef::insertMember(MemberDef *md,bool docOnly)
sameScope
)
{
- md->setGroupAlias(srcMd);
- return FALSE; // member already added
+ if (srcMd->getGroupAlias()==0)
+ {
+ md->setGroupAlias(srcMd);
+ }
+ else
+ {
+ md->setGroupAlias(srcMd->getGroupAlias());
+ }
+ return FALSE; // member is the same as one that is already added
}
}
mni->append(new MemberInfo(md,md->protection(),md->virtualness(),FALSE));