summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-06-15 18:33:32 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2021-06-15 18:33:32 (GMT)
commit6fc45bade4ffebc3d106aa7bdfcf31394d9ba2bc (patch)
tree5a87e41de437059be1f085206525a3bf42ccd93c
parent6bc55f458e01643ba7bf55ae1a2cefec6184be98 (diff)
downloadDoxygen-6fc45bade4ffebc3d106aa7bdfcf31394d9ba2bc.zip
Doxygen-6fc45bade4ffebc3d106aa7bdfcf31394d9ba2bc.tar.gz
Doxygen-6fc45bade4ffebc3d106aa7bdfcf31394d9ba2bc.tar.bz2
issue #8584: navtree js output varies from ASLRHEADmaster
-rw-r--r--src/doxygen.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 8183544..75b77af 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11195,14 +11195,24 @@ void searchInputFiles()
&Doxygen::inputPaths); // paths
}
}
+
+ // Sort the FileDef objects by full path to get a predictable ordering over multiple runs
std::sort(Doxygen::inputNameLinkedMap->begin(),
Doxygen::inputNameLinkedMap->end(),
[](const auto &f1,const auto &f2)
{
- return Config_getBool(FULL_PATH_NAMES) ?
- qstricmp(f1->fullName(),f2->fullName())<0 :
- qstricmp(f1->fileName(),f2->fileName())<0;
+ return qstricmp(f1->fullName(),f2->fullName())<0;
});
+ for (auto &fileName : *Doxygen::inputNameLinkedMap)
+ {
+ if (fileName->size()>1)
+ {
+ std::sort(fileName->begin(),fileName->end(),[](const auto &f1,const auto &f2)
+ {
+ return qstricmp(f1->absFilePath(),f2->absFilePath())<0;
+ });
+ }
+ }
g_s.end();
}