This commit is contained in:
johltn
2020-11-08 13:37:01 +01:00
parent 7827b15479
commit 34e5cd9d16
+7 -7
View File
@@ -171,11 +171,11 @@ namespace {
} }
} }
} }
#define IteratorImplementation MAKE_TYPE_NAME(IteratorImplementation_)
namespace IfcGeom { namespace IfcGeom {
#define IteratorImpl MAKE_TYPE_NAME(IteratorImplementation_)
template <typename P, typename PP> template <typename P, typename PP>
class IteratorImplementation : public IteratorImplementation<P, PP> { class IteratorImpl : public IteratorImplementation<P, PP> {
private: private:
std::atomic<int> progress_; std::atomic<int> progress_;
@@ -185,8 +185,8 @@ namespace IfcGeom {
typename std::vector<IfcGeom::Element<P, PP>*>::const_iterator task_result_iterator_; typename std::vector<IfcGeom::Element<P, PP>*>::const_iterator task_result_iterator_;
typename std::vector<IfcGeom::BRepElement<P, PP>*>::const_iterator native_task_result_iterator_; typename std::vector<IfcGeom::BRepElement<P, PP>*>::const_iterator native_task_result_iterator_;
IteratorImplementation(const IteratorImplementation&); // N/I IteratorImpl(const IteratorImpl&); // N/I
IteratorImplementation& operator=(const IteratorImplementation&); // N/I IteratorImpl& operator=(const IteratorImpl&); // N/I
MAKE_TYPE_NAME(Kernel) kernel; MAKE_TYPE_NAME(Kernel) kernel;
@@ -1017,7 +1017,7 @@ namespace IfcGeom {
} }
public: public:
IteratorImplementation(const IteratorSettings& settings, IfcParse::IfcFile* file, const std::vector<IfcGeom::filter_t>& filters, int num_threads) IteratorImpl(const IteratorSettings& settings, IfcParse::IfcFile* file, const std::vector<IfcGeom::filter_t>& filters, int num_threads)
: settings(settings) : settings(settings)
, ifc_file(file) , ifc_file(file)
, filters_(filters) , filters_(filters)
@@ -1027,7 +1027,7 @@ namespace IfcGeom {
_initialize(); _initialize();
} }
~IteratorImplementation() { ~IteratorImpl() {
if (owns_ifc_file) { if (owns_ifc_file) {
delete ifc_file; delete ifc_file;
} }