Remove dependency on Standard_failure #7788

src/ifcgeom/Iterator.cpp

@@ -620,17 +620,7 @@ const IfcGeom::Element* IfcGeom::Iterator::get_object(int id) {
 		}
 	} catch (const std::exception& e) {
 		Logger::Error(e);
-	}
+	} catch (...) {
-#ifdef IFOPSH_WITH_OPENCASCADE
-	catch (const Standard_Failure& e) {
-		if (e.GetMessageString() && strlen(e.GetMessageString())) {
-			Logger::Error(e.GetMessageString());
-		} else {
-			Logger::Error("Unknown error returning product");
-		}
-	}
-#endif
-	catch (...) {
 		Logger::Error("Unknown error returning product");
 	}
 
@@ -645,18 +635,7 @@ const IfcUtil::IfcBaseClass* IfcGeom::Iterator::create() {
 	} catch (const std::exception& e) {
 		Logger::Error(e);
 		had_error_processing_elements_ = true;
-	}
+	} catch (...) {
-#ifdef IFOPSH_WITH_OPENCASCADE
-	catch (const Standard_Failure& e) {
-		if (e.GetMessageString() && strlen(e.GetMessageString())) {
-			Logger::Error(e.GetMessageString());
-		} else {
-			Logger::Error("Unknown error creating geometry");
-		}
-		had_error_processing_elements_ = true;
-	}
-#endif
-	catch (...) {
 		Logger::Error("Unknown error creating geometry");
 		had_error_processing_elements_ = true;
 	}

src/ifcgeom/Iterator.h

@@ -68,10 +68,6 @@
 #include "../ifcgeom/abstract_mapping.h"
 #include "../ifcgeom/GeometrySerializer.h"
 
-#ifdef IFOPSH_WITH_OPENCASCADE
-#include <Standard_Failure.hxx>
-#endif
-
 #include <boost/algorithm/string.hpp>
 
 #include <map>

src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h

@@ -56,6 +56,21 @@
 #include "../../../ifcgeom/taxonomy.h"
 #include "../../../ifcgeom/ConversionSettings.h"
 
+namespace {
+template <typename Fn>
+bool handle_occt_exception(Fn&& fn) {
+    try {
+        return std::forward<Fn>(fn)();
+    } catch (const Standard_Failure& e) {
+        if (e.GetMessageString() && strlen(e.GetMessageString())) {
+            throw std::runtime_error(e.GetMessageString());
+		} else {
+            throw std::runtime_error("Unknown error creating geometry");
+		}
+    }
+}
+}
+
 namespace IfcGeom {
 
 class IFC_GEOMLIBRARY_API OpenCascadeKernel : public ifcopenshell::geometry::kernels::AbstractKernel {

src/ifcgeom/kernels/opencascade/boolean_result.cpp

@@ -84,6 +84,7 @@ namespace {
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::boolean_result::ptr br, ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
 	bool valid_result = false;
 	bool first = true;
 	const double tol = settings_.get<settings::Precision>().get();
@@ -196,4 +197,5 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::boolean_result::ptr br, Con
 	));
 
 	return true;
+    });
 }

src/ifcgeom/kernels/opencascade/extrusion.cpp

@@ -72,6 +72,8 @@ bool OpenCascadeKernel::convert(const taxonomy::extrusion::ptr extrusion, TopoDS
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::extrusion::ptr extrusion, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Shape shape;
 	if (!convert(extrusion, shape)) {
 		return false;
@@ -84,4 +86,6 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::extrusion::ptr extrusion, I
 		extrusion->surface_style
 	));
 	return true;
+
+	});
 }

src/ifcgeom/kernels/opencascade/face.cpp

@@ -599,6 +599,8 @@ bool OpenCascadeKernel::convert(const taxonomy::face::ptr face, TopoDS_Shape& re
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::face::ptr face, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Shape shape;
 	if (!convert(face, shape)) {
 		return false;
@@ -609,4 +611,6 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::face::ptr face, IfcGeom::Co
 		face->surface_style
 	));
 	return true;
+
+	});
 }

src/ifcgeom/kernels/opencascade/loft.cpp

@@ -427,6 +427,8 @@ bool OpenCascadeKernel::convert(const taxonomy::loft::ptr loft, TopoDS_Shape& re
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::loft::ptr loft, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Shape shape;
 	if (!convert(loft, shape)) {
 		return false;
@@ -438,4 +440,6 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::loft::ptr loft, IfcGeom::Co
 		loft->surface_style
 	));
 	return true;
+
+    });
 }

src/ifcgeom/kernels/opencascade/loop.cpp

@@ -378,6 +378,8 @@ bool OpenCascadeKernel::convert(const taxonomy::loop::ptr loop, TopoDS_Wire& wir
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::loop::ptr loop, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Wire shape;
 	if (!convert(loop, shape)) {
 		return false;
@@ -389,9 +391,13 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::loop::ptr loop, IfcGeom::Co
 		loop->surface_style
 	));
 	return true;
+
+	});
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::edge::ptr edge, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Wire shape = boost::get<TopoDS_Wire>(convert_curve(edge));
 
 	results.emplace_back(ConversionResult(
@@ -400,4 +406,6 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::edge::ptr edge, IfcGeom::Co
 		edge->surface_style
 	));
 	return true;
+
+	});
 }

src/ifcgeom/kernels/opencascade/shell.cpp

@@ -107,6 +107,8 @@ bool OpenCascadeKernel::convert(const taxonomy::shell::ptr l, TopoDS_Shape& shap
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::shell::ptr shell, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Shape shape;
 	if (!convert(shell, shape)) {
 		return false;
@@ -118,4 +120,6 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::shell::ptr shell, IfcGeom::
 		shell->surface_style
 	));
 	return true;
+
+	});
 }

src/ifcgeom/kernels/opencascade/solid.cpp

@@ -102,6 +102,8 @@ bool OpenCascadeKernel::convert(const taxonomy::solid::ptr solid, TopoDS_Shape&
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::solid::ptr solid, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Shape shape;
 	if (!convert(solid, shape)) {
 		return false;
@@ -113,4 +115,6 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::solid::ptr solid, IfcGeom::
 		solid->surface_style
 	));
 	return true;
+
+	});
 }

src/ifcgeom/kernels/opencascade/sweep_along_curve.cpp

@@ -308,6 +308,8 @@ bool OpenCascadeKernel::convert(const taxonomy::sweep_along_curve::ptr scs, Topo
 }
 
 bool OpenCascadeKernel::convert_impl(const taxonomy::sweep_along_curve::ptr scs, IfcGeom::ConversionResults& results) {
+    return handle_occt_exception([&]() -> bool {
+
 	TopoDS_Shape shape;
 	// For tiny radii occt will fail building the sweep, in which case we enlarge the inputs to occt, and add a scale matrix to the output
 	bool enlarged = false;
@@ -352,4 +354,6 @@ bool OpenCascadeKernel::convert_impl(const taxonomy::sweep_along_curve::ptr scs,
 		scs->surface_style
 	));
 	return true;
+
+	});
 }