TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

interrogate: Fix non-deterministic order of external import types

Browse Source 
Fixes #1651
This commit is contained in:
rdb 2024-05-28 11:11:21 +02:00
parent a655784d8d
commit 105f938d68
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -885,12 +885,19 @@ write_prototypes(ostream &out_code, ostream *out_h) {
// Write out a table of the externally imported types that will be filled in
// upon module initialization.
if (!_external_imports.empty()) {
std::vector<CPPType *> ext_imports(_external_imports.begin(), _external_imports.end());
if (!ext_imports.empty()) {
out_code << "#ifndef LINK_ALL_STATIC\n";
out_code << "static Dtool_TypeDef imports[] = {\n";
// Ensure that there is a deterministic ordering of external imports.
std::sort(ext_imports.begin(), ext_imports.end(),
[] (const CPPType *a, const CPPType *b) {
return a->get_local_name(&parser) < b->get_local_name(&parser);
});
int idx = 0;
for (CPPType *type : _external_imports) {
for (CPPType *type : ext_imports) {
string class_name = type->get_local_name(&parser);
string safe_name = make_safe_name(class_name);
@ -903,7 +910,7 @@ write_prototypes(ostream &out_code, ostream *out_h) {
out_code << "#endif\n\n";
}
for (CPPType *type : _external_imports) {
for (CPPType *type : ext_imports) {
string class_name = type->get_local_name(&parser);
string safe_name = make_safe_name(class_name);