diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-05 20:48:32 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-05 20:48:32 (GMT) |
| commit | bae68b877892a0916d3d8f1f3cccebe4a95882d2 (patch) | |
| tree | 4208eaf7a0af8eac67e03437f69f06cb8cb54eef /src | |
| parent | 7343874ae210ae1e1ab9c39b700159222872f48e (diff) | |
| parent | d75a287f2c5fc37cde07006bec7d027453d9827b (diff) | |
| download | Doxygen-bae68b877892a0916d3d8f1f3cccebe4a95882d2.zip Doxygen-bae68b877892a0916d3d8f1f3cccebe4a95882d2.tar.gz Doxygen-bae68b877892a0916d3d8f1f3cccebe4a95882d2.tar.bz2 | |
Merge branch 'Rel_1_8_20_DGA' of https://github.com/DGA45/doxygen into DGA45-Rel_1_8_20_DGA
Diffstat (limited to 'src')
| -rw-r--r-- | src/doxygen.cpp | 3 | ||||
| -rw-r--r-- | src/perlmodgen.cpp | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index b195715..041974c 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1380,7 +1380,8 @@ static void processTagLessClasses(ClassDef *rootCd, if (type.find(icd->name())!=-1) // matching tag less struct/union { QCString name = md->name(); - if (md->isAnonymous()) name = "__unnamed__"; + /* 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 (!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/perlmodgen.cpp b/src/perlmodgen.cpp index ffb0fed..8482768 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -1569,6 +1569,7 @@ void PerlModGenerator::generatePerlModForMember(const MemberDef *md,const Defini // (templateArguments(), definitionTemplateParameterLists()) QCString memType; + QCString name; bool isFunc=FALSE; switch (md->memberType()) { @@ -1590,9 +1591,13 @@ 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 */ + m_output.openHash() .addFieldQuotedString("kind", memType) - .addFieldQuotedString("name", md->name()) + .addFieldQuotedString("name", name) .addFieldQuotedString("virtualness", getVirtualnessName(md->virtualness())) .addFieldQuotedString("protection", getProtectionName(md->protection())) .addFieldBoolean("static", md->isStatic()); @@ -1830,6 +1835,8 @@ void PerlModGenerator::generatePerlModForClass(const ClassDef *cd) m_output.openHash() .addFieldQuotedString("name", cd->name()); + /* DGA: fix # #7547 Perlmod does not generate "kind" information to discriminate struct/union */ + m_output.addFieldQuotedString("kind", cd->compoundTypeString()); if (!cd->baseClasses().empty()) { |