From 49cf297eee312ca4c5344213c5d4dc56e7eb2b4b Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sat, 7 Aug 2021 10:58:20 +0200 Subject: [PATCH] further optional type changes --- src/ifcgeom/IfcGeomFunctions.cpp | 4 ++-- src/ifcgeom/IfcGeomShapes.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ifcgeom/IfcGeomFunctions.cpp b/src/ifcgeom/IfcGeomFunctions.cpp index 5f59cec4dc..1c6988bb8e 100644 --- a/src/ifcgeom/IfcGeomFunctions.cpp +++ b/src/ifcgeom/IfcGeomFunctions.cpp @@ -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) { diff --git a/src/ifcgeom/IfcGeomShapes.cpp b/src/ifcgeom/IfcGeomShapes.cpp index a40a51684a..f7c0a05693 100644 --- a/src/ifcgeom/IfcGeomShapes.cpp +++ b/src/ifcgeom/IfcGeomShapes.cpp @@ -1666,7 +1666,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcTriangulatedFaceSet* l, TopoDS faceset_helper< std::vector, std::vector - > 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, std::vector - > helper(this, coord_list, indices, pfs->hasClosed() ? pfs->Closed() : false); + > helper(this, coord_list, indices, pfs->Closed().get_value_or(false)); TopTools_ListOfShape faces;