From 3ef4e8152f5088efcbafdef3bccd9caf2e3b2cd9 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Wed, 15 Nov 2023 11:05:06 +0100 Subject: [PATCH] Commit suggestions in #3992 Thanks @RickBrice --- src/ifcgeom/ConversionResult.h | 4 ++-- src/ifcgeom/kernels/cgal/CgalConversionResult.h | 4 ++-- src/ifcgeom/kernels/cgal/nef_to_halfspace_tree.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ifcgeom/ConversionResult.h b/src/ifcgeom/ConversionResult.h index 692ff87618..333b305ec4 100644 --- a/src/ifcgeom/ConversionResult.h +++ b/src/ifcgeom/ConversionResult.h @@ -101,9 +101,9 @@ namespace IfcGeom { bool binary_op_bool(OpaqueNumber* other) const { auto nnd = dynamic_cast(other); if (nnd) { - return new NumberNativeDouble(Fn(value_, nnd->value_)); + return Fn(value_, nnd->value_); } else { - return nullptr; + return false; } } diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.h b/src/ifcgeom/kernels/cgal/CgalConversionResult.h index e5d7e896e3..0644edd183 100644 --- a/src/ifcgeom/kernels/cgal/CgalConversionResult.h +++ b/src/ifcgeom/kernels/cgal/CgalConversionResult.h @@ -118,9 +118,9 @@ namespace ifcopenshell { namespace geometry { bool binary_op_bool(OpaqueNumber* other) const { auto nnd = dynamic_cast(other); if (nnd) { - return new NumberEpeck(Fn(value_, nnd->value_)); + return Fn(value_, nnd->value_); } else { - return nullptr; + return false; } } diff --git a/src/ifcgeom/kernels/cgal/nef_to_halfspace_tree.h b/src/ifcgeom/kernels/cgal/nef_to_halfspace_tree.h index 6e1dd61c70..2c9639cc92 100644 --- a/src/ifcgeom/kernels/cgal/nef_to_halfspace_tree.h +++ b/src/ifcgeom/kernels/cgal/nef_to_halfspace_tree.h @@ -475,7 +475,7 @@ public: } virtual std::unique_ptr> map(const std::map>& m) const { - std::array abcd = { {plane_.a(), plane_.b(), plane_.c()} }; + std::array abcd{ plane_.a(), plane_.b(), plane_.c() }; auto minel = std::min_element(abcd.begin(), abcd.end()); auto maxel = std::max_element(abcd.begin(), abcd.end()); auto maxval = ((-*minel) > *maxel) ? (-*minel) : *maxel;