summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2006-12-02 14:54:35 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2006-12-02 14:54:35 (GMT)
commitafbfacbcf5f78ab02d8ff99b5982198e4f45f6b5 (patch)
tree0af428e60324ef94f5e04cee664374d5907c36ac /src/classdef.cpp
parent7e81d44c98dbbb1bb30d623be52ca76bbd880038 (diff)
downloadDoxygen-afbfacbcf5f78ab02d8ff99b5982198e4f45f6b5.zip
Doxygen-afbfacbcf5f78ab02d8ff99b5982198e4f45f6b5.tar.gz
Doxygen-afbfacbcf5f78ab02d8ff99b5982198e4f45f6b5.tar.bz2
Release-1.5.1-20061202
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 9ed8c1f..ed4a603 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1,6 +1,6 @@
/******************************************************************************
*
- *
+ * $Id$
*
* Copyright (C) 1997-2006 by Dimitri van Heesch.
*
@@ -2086,6 +2086,7 @@ void ClassDef::mergeMembers()
bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB" );
if (baseClasses())
{
+ //printf(" => has base classes!\n");
BaseClassListIterator bcli(*baseClasses());
BaseClassDef *bcd;
for ( ; (bcd=bcli.current()) ; ++bcli )
@@ -2096,17 +2097,17 @@ void ClassDef::mergeMembers()
bClass->mergeMembers();
MemberNameInfoSDict *srcMnd = bClass->memberNameInfoSDict();
- MemberNameInfoSDict *dstMnd = m_impl->allMemberNameInfoSDict;
+ MemberNameInfoSDict *dstMnd = m_impl->allMemberNameInfoSDict;
- if (srcMnd && dstMnd)
+ if (srcMnd)
{
MemberNameInfoSDict::Iterator srcMnili(*srcMnd);
MemberNameInfo *srcMni;
for ( ; (srcMni=srcMnili.current()) ; ++srcMnili)
{
- //printf("Base member name %s\n",srcMni->memberName());
+ //printf(" Base member name %s\n",srcMni->memberName());
MemberNameInfo *dstMni;
- if ((dstMni=dstMnd->find(srcMni->memberName())))
+ if (dstMnd!=0 && (dstMni=dstMnd->find(srcMni->memberName())))
// a member with that name is already in the class.
// the member may hide or reimplement the one in the sub class
// or there may be another path to the base class that is already
@@ -2298,6 +2299,12 @@ void ClassDef::mergeMembers()
}
}
+ if (dstMnd==0)
+ {
+ m_impl->allMemberNameInfoSDict = new MemberNameInfoSDict(17);
+ m_impl->allMemberNameInfoSDict->setAutoDelete(TRUE);
+ dstMnd = m_impl->allMemberNameInfoSDict;
+ }
// add it to the dictionary
dstMnd->append(newMni->memberName(),newMni);
}
@@ -2317,7 +2324,7 @@ void ClassDef::mergeCategory(ClassDef *category)
category->setCategoryOf(this);
MemberNameInfoSDict *srcMnd = category->memberNameInfoSDict();
- MemberNameInfoSDict *dstMnd = m_impl->allMemberNameInfoSDict;
+ MemberNameInfoSDict *dstMnd = m_impl->allMemberNameInfoSDict;
if (srcMnd && dstMnd)
{