From c18458b3db2ca9b1f895c032ac18577139a4b659 Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Sun, 13 Nov 2022 11:21:58 +0100
Subject: [PATCH] Refactoring

---
 src/ifcgeom_schema_agnostic/IfcGeomTree.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ifcgeom_schema_agnostic/IfcGeomTree.h b/src/ifcgeom_schema_agnostic/IfcGeomTree.h
index f259229c1c..8c7e99fde5 100644
--- a/src/ifcgeom_schema_agnostic/IfcGeomTree.h
+++ b/src/ifcgeom_schema_agnostic/IfcGeomTree.h
@@ -26,6 +26,7 @@
 #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 #include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h"
 #include "../ifcgeom_schema_agnostic/Kernel.h"
+#include "../ifcgeom_schema_agnostic/base_utils.h"
 
 #include <NCollection_UBTree.hxx>
 #include <BRepBndLib.hxx>
@@ -112,8 +113,8 @@ namespace IfcGeom {
 						return dss.Value() <= extend;
 					}
 				} else {
-					if (IfcGeom::Kernel::count(A, TopAbs_SHELL) == 0 ||
-						IfcGeom::Kernel::count(B, TopAbs_SHELL) == 0)
+					if (util::count(A, TopAbs_SHELL) == 0 ||
+						util::count(B, TopAbs_SHELL) == 0)
 					{
 						return false;
 					}
@@ -121,14 +122,14 @@ namespace IfcGeom {
 					if (completely_within) {
 						BRepAlgoAPI_Cut cut(B, A);
 						if (cut.IsDone()) {
-							if (IfcGeom::Kernel::count(cut.Shape(), TopAbs_SHELL) == 0) {
+							if (util::count(cut.Shape(), TopAbs_SHELL) == 0) {
 								return true;
 							}
 						}
 					} else {
 						BRepAlgoAPI_Common common(A, B);
 						if (common.IsDone()) {
-							if (IfcGeom::Kernel::count(common.Shape(), TopAbs_SHELL) > 0) {
+							if (util::count(common.Shape(), TopAbs_SHELL) > 0) {
 								return true;
 							}
 						}