diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-05 20:50:59 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-05 20:50:59 (GMT) |
| commit | 0b54d06d4449d91a0890e589ba48daaf41794284 (patch) | |
| tree | 579c0916f1e6bebf0806a01683aad2b164857a0b /src | |
| parent | bae68b877892a0916d3d8f1f3cccebe4a95882d2 (diff) | |
| download | Doxygen-0b54d06d4449d91a0890e589ba48daaf41794284.zip Doxygen-0b54d06d4449d91a0890e589ba48daaf41794284.tar.gz Doxygen-0b54d06d4449d91a0890e589ba48daaf41794284.tar.bz2 | |
Minor tweaks
Diffstat (limited to 'src')
| -rw-r--r-- | src/doxygen.cpp | 3 | ||||
| -rw-r--r-- | src/memberdef.cpp | 2 | ||||
| -rw-r--r-- | src/perlmodgen.cpp | 11 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 041974c..0a86123 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1380,8 +1380,7 @@ static void processTagLessClasses(ClassDef *rootCd, if (type.find(icd->name())!=-1) // matching tag less struct/union { QCString name = md->name(); - /* DGA fix #7556 ANSI-C anonymous (unnamed) struct/unions have duplicated names (__unnamed__) */ - if (md->isAnonymous()) name = "__unnamed__" + name.right(name.length()-1); /* DGA: ensure unique name */ + if (md->isAnonymous()) name = "__unnamed" + name.right(name.length()-1)+"__"; if (!prefix.isEmpty()) name.prepend(prefix+"."); //printf(" found %s for class %s\n",name.data(),cd->name().data()); ClassDef *ncd = createTagLessInstance(rootCd,icd,name); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index cae209c..8f3341c 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -3435,7 +3435,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml, { //printf("Anonymous compound '%s'\n",cname.data()); ol.startDoxyAnchor(cfname,cname,memAnchor,doxyName,doxyArgs); - ol.startMemberDoc(ciname,name(),memAnchor,name(),memCount,memTotal,showInline); + ol.startMemberDoc(ciname,name(),memAnchor,"",memCount,memTotal,showInline); // search for the last anonymous compound name in the definition int si=ldef.find(' '),pi,ei=i+l; if (si==-1) si=0; diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 8482768..c2d120f 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -1591,9 +1591,8 @@ void PerlModGenerator::generatePerlModForMember(const MemberDef *md,const Defini case MemberType_Dictionary: memType="dictionary"; break; } - /* DGA fix #7556 ANSI-C anonymous (unnamed) struct/unions have duplicated names (__unnamed__) */ name = md->name(); - if (md->isAnonymous()) name = "__unnamed__" + name.right(name.length() - 1); /* DGA: ensure unique name */ + if (md->isAnonymous()) name = "__unnamed" + name.right(name.length() - 1)+"__"; m_output.openHash() .addFieldQuotedString("kind", memType) @@ -1701,14 +1700,12 @@ void PerlModGenerator::generatePerlModForMember(const MemberDef *md,const Defini } } - /* DGA: fix #7495 Perlmod does not generate bitfield */ if (md->memberType() == MemberType_Variable && md->bitfieldString()) { - QCString bitfield = md->bitfieldString(); - if (bitfield.at(0) == ':') bitfield = bitfield.mid(1); - m_output.addFieldQuotedString("bitfield", bitfield); + QCString bitfield = md->bitfieldString(); + if (bitfield.at(0) == ':') bitfield = bitfield.mid(1); + m_output.addFieldQuotedString("bitfield", bitfield); } - /* DGA: end of fix #7495 */ const MemberDef *rmd = md->reimplements(); if (rmd) |