Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-27 02:31:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix iteration: prevent inserting nullptr equivalents into a set

Browse Source
This commit is contained in:
Thomas Krijnen
2026-04-09 11:53:28 +02:00
parent a425bb6da0
commit 7d6c6bd523
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/mapping/mapping.cpp
+3 -3
View File
@@ -132,7 +132,7 @@ bool mapping::reuse_ok_(const std::vector<IfcSchema::IfcProduct>& products) {
return true; return true;
} }
std::set<express::Base> associated_single_materials; std::set<std::optional<express::Base>> associated_single_materials;
for (auto& product : products) { for (auto& product : products) {
if (!settings_.get<settings::DisableOpeningSubtractions>().get() && !find_openings(product).empty()) { if (!settings_.get<settings::DisableOpeningSubtractions>().get() && !find_openings(product).empty()) {
@@ -151,8 +151,8 @@ bool mapping::reuse_ok_(const std::vector<IfcSchema::IfcProduct>& products) {
} }
} }
// Note that this can be a nullptr (!), but the fact that set size should be one still holds auto mat = get_single_material_association(product);
associated_single_materials.insert(get_single_material_association(product)); associated_single_materials.insert(mat ? std::optional<express::Base>{mat} : std::nullopt);
if (associated_single_materials.size() > 1) return false; if (associated_single_materials.size() > 1) return false;
} }