From 12838cedd10eb1a2e448c43a145ccdf120d625d6 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 15 May 2022 15:16:06 +0200
Subject: [PATCH] explicit d'tor solves problem
---
Device/Mask/DetectorMask.cpp | 3 +++
Device/Mask/DetectorMask.h | 4 ++--
GUI/View/Mask/MaskResultsPresenter.cpp | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Device/Mask/DetectorMask.cpp b/Device/Mask/DetectorMask.cpp
index e4ec31bf19a..16a9c3dff14 100644
--- a/Device/Mask/DetectorMask.cpp
+++ b/Device/Mask/DetectorMask.cpp
@@ -15,12 +15,15 @@
#include "Device/Mask/DetectorMask.h"
#include "Base/Axis/IAxis.h"
#include "Device/Histo/Histogram2D.h"
+#include "Device/Mask/IShape2D.h"
DetectorMask::DetectorMask()
: m_number_of_masked_channels(0)
{
}
+DetectorMask::~DetectorMask() = default;
+
DetectorMask::DetectorMask(const DetectorMask& other)
: m_shapes(other.m_shapes)
, m_mask_of_shape(other.m_mask_of_shape)
diff --git a/Device/Mask/DetectorMask.h b/Device/Mask/DetectorMask.h
index cdd7e545964..2997d39f056 100644
--- a/Device/Mask/DetectorMask.h
+++ b/Device/Mask/DetectorMask.h
@@ -16,14 +16,13 @@
#define BORNAGAIN_DEVICE_MASK_DETECTORMASK_H
#include "Device/Data/OutputData.h"
-#include "Device/Mask/IShape2D.h"
-
#ifndef SWIG
#include "Base/Types/OwningVector.h"
#endif
class Histogram2D;
class IAxis;
+class IShape2D;
template <class T>
class OutputData;
@@ -34,6 +33,7 @@ class OutputData;
class DetectorMask {
public:
DetectorMask();
+ ~DetectorMask();
DetectorMask(const DetectorMask& other);
DetectorMask& operator=(const DetectorMask& other);
diff --git a/GUI/View/Mask/MaskResultsPresenter.cpp b/GUI/View/Mask/MaskResultsPresenter.cpp
index 3844e19bf3c..b21f4f99aee 100644
--- a/GUI/View/Mask/MaskResultsPresenter.cpp
+++ b/GUI/View/Mask/MaskResultsPresenter.cpp
@@ -14,6 +14,7 @@
#include "GUI/View/Mask/MaskResultsPresenter.h"
#include "Device/Mask/DetectorMask.h"
+#include "Device/Mask/IShape2D.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Model/SessionModel.h"
--
GitLab