summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-03-17 20:13:31 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-03-17 20:13:31 (GMT)
commitca3fb0a6df32b732c6b390b937f3ada001cb1e7a (patch)
treef846ab2e854c959c8e76153065efd17e01d7a02b /src/memberdef.cpp
parentecbd3e379768b13e0a62013faca341cd8c3022c7 (diff)
downloadDoxygen-ca3fb0a6df32b732c6b390b937f3ada001cb1e7a.zip
Doxygen-ca3fb0a6df32b732c6b390b937f3ada001cb1e7a.tar.gz
Doxygen-ca3fb0a6df32b732c6b390b937f3ada001cb1e7a.tar.bz2
Release-1.2.14-20020317
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 69bcf9f..dfcea4a 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -380,11 +380,10 @@ MemberDef::~MemberDef()
void MemberDef::setReimplements(MemberDef *md)
{
- //if (m_templateMaster)
- //{
- // m_templateMaster->setReimplements(md);
- //}
- redefines=md;
+ //if (redefines==0) redefines = new MemberList;
+ //if (redefines->find(md)==-1) redefines->inSort(md);
+
+ redefines = md;
}
void MemberDef::insertReimplementedBy(MemberDef *md)
@@ -394,10 +393,13 @@ void MemberDef::insertReimplementedBy(MemberDef *md)
m_templateMaster->insertReimplementedBy(md);
}
if (redefinedBy==0) redefinedBy = new MemberList;
- if (redefinedBy->find(md)==-1) redefinedBy->inSort(md);
+ if (redefinedBy->findRef(md)==-1)
+ {
+ redefinedBy->inSort(md);
+ }
}
-MemberDef *MemberDef::reimplements() const
+MemberDef *MemberDef::reimplements() const
{
return redefines;
}
@@ -1315,7 +1317,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
}
MemberDef *bmd=reimplements();
- ClassDef *bcd=0;
+ ClassDef *bcd=0;
if (bmd && (bcd=bmd->getClassDef()))
{
// write class that contains a member that is reimplemented by this one
@@ -1342,7 +1344,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
if (bd==0) bd=bcd;
ol.writeObjectLink(bd->getReference(),bd->getOutputFileBase(),
bmd->anchor(),bcd->name());
-
+
//ol.writeObjectLink(bcd->getReference(),bcd->getOutputFileBase(),
// bmd->anchor(),bcd->name());
if ( bd->isLinkableInProject() )
@@ -1374,6 +1376,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
//ol.writeString(".");
}
+
MemberList *bml=reimplementedBy();
if (bml)
{