From 7827b154792537c1ac05c8db7804133f331df8d0 Mon Sep 17 00:00:00 2001 From: johltn Date: Sun, 8 Nov 2020 11:32:09 +0100 Subject: [PATCH] Update --- src/ifcgeom/IfcGeomIteratorImplementation.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ifcgeom/IfcGeomIteratorImplementation.h b/src/ifcgeom/IfcGeomIteratorImplementation.h index 172f19a837..8f2f21f1b0 100644 --- a/src/ifcgeom/IfcGeomIteratorImplementation.h +++ b/src/ifcgeom/IfcGeomIteratorImplementation.h @@ -171,11 +171,11 @@ namespace { } } } - +#define IteratorImplementation MAKE_TYPE_NAME(IteratorImplementation_) namespace IfcGeom { template - class MAKE_TYPE_NAME(IteratorImplementation_) : public IteratorImplementation { + class IteratorImplementation : public IteratorImplementation { private: std::atomic progress_; @@ -185,8 +185,8 @@ namespace IfcGeom { typename std::vector*>::const_iterator task_result_iterator_; typename std::vector*>::const_iterator native_task_result_iterator_; - MAKE_TYPE_NAME(IteratorImplementation_)(const MAKE_TYPE_NAME(IteratorImplementation_)&); // N/I - MAKE_TYPE_NAME(IteratorImplementation_)& operator=(const MAKE_TYPE_NAME(IteratorImplementation_)&); // N/I + IteratorImplementation(const IteratorImplementation&); // N/I + IteratorImplementation& operator=(const IteratorImplementation&); // N/I MAKE_TYPE_NAME(Kernel) kernel; @@ -1017,7 +1017,7 @@ namespace IfcGeom { } public: - MAKE_TYPE_NAME(IteratorImplementation_)(const IteratorSettings& settings, IfcParse::IfcFile* file, const std::vector& filters, int num_threads) + IteratorImplementation(const IteratorSettings& settings, IfcParse::IfcFile* file, const std::vector& filters, int num_threads) : settings(settings) , ifc_file(file) , filters_(filters) @@ -1027,7 +1027,7 @@ namespace IfcGeom { _initialize(); } - ~MAKE_TYPE_NAME(IteratorImplementation_)() { + ~IteratorImplementation() { if (owns_ifc_file) { delete ifc_file; }