Skip to content
Snippets Groups Projects
Commit 12838ced authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

explicit d'tor solves problem

parent 11497f33
No related branches found
No related tags found
1 merge request!879+ OwningVector, and other cleanup in view of pybind11
...@@ -15,12 +15,15 @@ ...@@ -15,12 +15,15 @@
#include "Device/Mask/DetectorMask.h" #include "Device/Mask/DetectorMask.h"
#include "Base/Axis/IAxis.h" #include "Base/Axis/IAxis.h"
#include "Device/Histo/Histogram2D.h" #include "Device/Histo/Histogram2D.h"
#include "Device/Mask/IShape2D.h"
DetectorMask::DetectorMask() DetectorMask::DetectorMask()
: m_number_of_masked_channels(0) : m_number_of_masked_channels(0)
{ {
} }
DetectorMask::~DetectorMask() = default;
DetectorMask::DetectorMask(const DetectorMask& other) DetectorMask::DetectorMask(const DetectorMask& other)
: m_shapes(other.m_shapes) : m_shapes(other.m_shapes)
, m_mask_of_shape(other.m_mask_of_shape) , m_mask_of_shape(other.m_mask_of_shape)
......
...@@ -16,14 +16,13 @@ ...@@ -16,14 +16,13 @@
#define BORNAGAIN_DEVICE_MASK_DETECTORMASK_H #define BORNAGAIN_DEVICE_MASK_DETECTORMASK_H
#include "Device/Data/OutputData.h" #include "Device/Data/OutputData.h"
#include "Device/Mask/IShape2D.h"
#ifndef SWIG #ifndef SWIG
#include "Base/Types/OwningVector.h" #include "Base/Types/OwningVector.h"
#endif #endif
class Histogram2D; class Histogram2D;
class IAxis; class IAxis;
class IShape2D;
template <class T> template <class T>
class OutputData; class OutputData;
...@@ -34,6 +33,7 @@ class OutputData; ...@@ -34,6 +33,7 @@ class OutputData;
class DetectorMask { class DetectorMask {
public: public:
DetectorMask(); DetectorMask();
~DetectorMask();
DetectorMask(const DetectorMask& other); DetectorMask(const DetectorMask& other);
DetectorMask& operator=(const DetectorMask& other); DetectorMask& operator=(const DetectorMask& other);
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "GUI/View/Mask/MaskResultsPresenter.h" #include "GUI/View/Mask/MaskResultsPresenter.h"
#include "Device/Mask/DetectorMask.h" #include "Device/Mask/DetectorMask.h"
#include "Device/Mask/IShape2D.h"
#include "GUI/Model/Data/IntensityDataItem.h" #include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Device/MaskItems.h" #include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Model/SessionModel.h" #include "GUI/Model/Model/SessionModel.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment