diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-01-19 19:31:52 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-01-19 19:31:52 (GMT) |
| commit | dc67dbe5bd5a48756c591ad02b9f68fbd2a57687 (patch) | |
| tree | 3351d533785634c3243c8bd36776149f37c976f7 | |
| parent | 5444d2e935275ef5fe767cbf1474253ded0d03b9 (diff) | |
| download | Doxygen-dc67dbe5bd5a48756c591ad02b9f68fbd2a57687.zip Doxygen-dc67dbe5bd5a48756c591ad02b9f68fbd2a57687.tar.gz Doxygen-dc67dbe5bd5a48756c591ad02b9f68fbd2a57687.tar.bz2 | |
issue #7474: [1.8.16 regression] HTML output varies from ASLR
| -rw-r--r-- | src/memberlist.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/memberlist.cpp b/src/memberlist.cpp index 278023b..edd164b 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -75,8 +75,15 @@ int MemberList::compareValues(const MemberDef *c1, const MemberDef *c2) const return 1; } int cmp = qstricmp(c1->name(),c2->name()); - if (cmp==0) cmp = qstricmp(c1->argsString(),c2->argsString()); - return cmp!=0 ? cmp : c1->getDefLine()-c2->getDefLine(); + if (cmp==0 && c1->argsString() && c2->argsString()) + { + cmp = qstricmp(c1->argsString(),c2->argsString()); + } + if (cmp==0) + { + cmp = c1->getDefLine()-c2->getDefLine(); + } + return cmp; } int MemberList::countInheritableMembers(const ClassDef *inheritedFrom) const |