From 8efb86420e7aec09de224b726c53174e63de7f1a Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Sun, 1 Sep 2019 16:48:50 +0200
Subject: [PATCH] Compilation errors

---
 src/ifcgeom/kernel_agnostic/AbstractKernel.cpp      | 3 +++
 src/ifcgeom/kernel_agnostic/AbstractKernel.h        | 7 +++++++
 src/ifcgeom/kernels/cgal/CgalKernel.h               | 7 -------
 src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h | 7 -------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/ifcgeom/kernel_agnostic/AbstractKernel.cpp b/src/ifcgeom/kernel_agnostic/AbstractKernel.cpp
index 65bfce6556..99d1ee1d17 100644
--- a/src/ifcgeom/kernel_agnostic/AbstractKernel.cpp
+++ b/src/ifcgeom/kernel_agnostic/AbstractKernel.cpp
@@ -2,6 +2,9 @@
 
 #include "../../ifcgeom/schema_agnostic/IfcGeomElement.h"
 #include "../../ifcgeom/kernels/opencascade/OpenCascadeKernel.h"
+
+#undef Handle
+
 #include "../../ifcgeom/kernels/cgal/CgalKernel.h"
 
 namespace {
diff --git a/src/ifcgeom/kernel_agnostic/AbstractKernel.h b/src/ifcgeom/kernel_agnostic/AbstractKernel.h
index 45c3ed5bf5..27bacabe19 100644
--- a/src/ifcgeom/kernel_agnostic/AbstractKernel.h
+++ b/src/ifcgeom/kernel_agnostic/AbstractKernel.h
@@ -6,6 +6,13 @@
 #include "../../ifcgeom/schema_agnostic/IfcGeomRepresentation.h"
 #include "../../ifcgeom/taxonomy.h"
 
+static const double ALMOST_ZERO = 1.e-9;
+
+template <typename T>
+inline static bool ALMOST_THE_SAME(const T& a, const T& b, double tolerance = ALMOST_ZERO) {
+	return fabs(a - b) < tolerance;
+}
+
 namespace ifcopenshell { namespace geometry { namespace kernels {
 
 	class IFC_GEOM_API AbstractKernel {
diff --git a/src/ifcgeom/kernels/cgal/CgalKernel.h b/src/ifcgeom/kernels/cgal/CgalKernel.h
index 0041c9c172..1ac193a673 100644
--- a/src/ifcgeom/kernels/cgal/CgalKernel.h
+++ b/src/ifcgeom/kernels/cgal/CgalKernel.h
@@ -37,13 +37,6 @@ if ( it != cache.T.end() ) { e = it->second; return true; }
 
 #include <cmath>
 
-#define ALMOST_ZERO 1.e-9
-
-template <typename T>
-inline static bool ALMOST_THE_SAME(const T& a, const T& b, double tolerance=ALMOST_ZERO) {
-        return fabs(a-b) < tolerance;
-}
-
 #include "../../../ifcparse/macros.h"
 
 #include "../../../ifcgeom/kernel_agnostic/AbstractKernel.h"
diff --git a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h b/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h
index defcc52a0c..e4872fbfd0 100644
--- a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h
+++ b/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h
@@ -22,13 +22,6 @@
 
 #include <cmath>
 
-static const double ALMOST_ZERO = 1.e-9;
-
-template <typename T>
-inline static bool ALMOST_THE_SAME(const T& a, const T& b, double tolerance=ALMOST_ZERO) {
-	return fabs(a-b) < tolerance; 
-}
-
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Mat.hxx>