diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2000-12-20 19:54:07 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2000-12-20 19:54:07 (GMT) |
| commit | ba0681136c643f13bb56b3b44d4cba3c70c8338d (patch) | |
| tree | 1fae01f2e80d65a57788a3f11ab9fa7463c22ec9 /src/classdef.cpp | |
| parent | 6505abff80c988faf734b2e4c31cd2a94c2c10b5 (diff) | |
| download | Doxygen-ba0681136c643f13bb56b3b44d4cba3c70c8338d.zip Doxygen-ba0681136c643f13bb56b3b44d4cba3c70c8338d.tar.gz Doxygen-ba0681136c643f13bb56b3b44d4cba3c70c8338d.tar.bz2 | |
Release-1.2.3-20001220
Diffstat (limited to 'src/classdef.cpp')
| -rw-r--r-- | src/classdef.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index ac104eb..01bc655 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -1665,7 +1665,6 @@ void ClassDef::mergeMembers() Specifier virt=mi->virt; if (mi->virt==Normal && bcd->virt!=Normal) virt=bcd->virt; MemberInfo *newMi=new MemberInfo(mi->memberDef,bcd->prot,virt); - //if (mi->memberDef->getClassDef()!=bClass) newMi->scopePath=bClass->name()+"::"+mi->scopePath; newMi->ambigClass=mi->ambigClass; newMi->ambiguityResolutionScope=mi->ambiguityResolutionScope.copy(); @@ -1674,7 +1673,7 @@ void ClassDef::mergeMembers() } // add it to the list and dictionary - dstMnl->inSort(newMni); + dstMnl->append(newMni); dstMnd->insert(newMni->memberName(),newMni); } } |