further optional type changes

This commit is contained in:
Thomas Krijnen
2021-08-07 10:58:20 +02:00
parent 321d18990f
commit 49cf297eee
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -927,11 +927,11 @@ bool IfcGeom::Kernel::convert_openings_fast(const IfcSchema::IfcProduct* entity,
IfcSchema::IfcRelVoidsElement* v = *it;
IfcSchema::IfcFeatureElementSubtraction* fes = v->RelatedOpeningElement();
if ( fes->declaration().is(IfcSchema::IfcOpeningElement::Class()) ) {
if (!fes->hasRepresentation()) continue;
if (!fes->Representation()) continue;
// Convert the IfcRepresentation of the IfcOpeningElement
gp_Trsf opening_trsf;
if (fes->hasObjectPlacement()) {
if (fes->ObjectPlacement()) {
try {
convert(fes->ObjectPlacement(),opening_trsf);
} catch (const std::exception& e) {
+2 -2
View File
@@ -1666,7 +1666,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcTriangulatedFaceSet* l, TopoDS
faceset_helper<
std::vector<double>,
std::vector<int>
> helper(this, coord_list, indices, l->hasClosed() ? l->Closed() : false);
> helper(this, coord_list, indices, l->Closed().get_value_or(false));
TopTools_ListOfShape faces;
@@ -1722,7 +1722,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcPolygonalFaceSet* pfs, TopoDS_
faceset_helper<
std::vector<double>,
std::vector<int>
> helper(this, coord_list, indices, pfs->hasClosed() ? pfs->Closed() : false);
> helper(this, coord_list, indices, pfs->Closed().get_value_or(false));
TopTools_ListOfShape faces;