From aa153fec874265111a8e7f626f33910234496cb6 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sat, 26 Sep 2020 08:46:33 +0200
Subject: [PATCH] Initialize base class in copy c'ytor, as suggested by g++
warning
---
Core/Detector/IDetector.cpp | 3 ++-
Core/Detector/RegionOfInterest.cpp | 3 ++-
Core/Instrument/Instrument.cpp | 2 +-
Core/SampleBuilderEngine/SampleProvider.cpp | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Core/Detector/IDetector.cpp b/Core/Detector/IDetector.cpp
index e454a5d2697..84c1b0e3eea 100644
--- a/Core/Detector/IDetector.cpp
+++ b/Core/Detector/IDetector.cpp
@@ -27,7 +27,8 @@ IDetector::IDetector()
}
IDetector::IDetector(const IDetector& other)
- : m_axes(other.m_axes), m_detection_properties(other.m_detection_properties)
+ : ICloneable(), INode(),
+ m_axes(other.m_axes), m_detection_properties(other.m_detection_properties)
{
if (other.mP_detector_resolution)
setDetectorResolution(*other.mP_detector_resolution);
diff --git a/Core/Detector/RegionOfInterest.cpp b/Core/Detector/RegionOfInterest.cpp
index dedd11e0bd2..34749163c32 100644
--- a/Core/Detector/RegionOfInterest.cpp
+++ b/Core/Detector/RegionOfInterest.cpp
@@ -49,7 +49,8 @@ RegionOfInterest* RegionOfInterest::clone() const
RegionOfInterest::~RegionOfInterest() {}
RegionOfInterest::RegionOfInterest(const RegionOfInterest& other)
- : m_rectangle(other.m_rectangle->clone()), m_ax1(other.m_ax1), m_ay1(other.m_ay1),
+ : INode(),
+ m_rectangle(other.m_rectangle->clone()), m_ax1(other.m_ax1), m_ay1(other.m_ay1),
m_ax2(other.m_ax2), m_ay2(other.m_ay2), m_glob_index0(other.m_glob_index0),
m_detector_dims(other.m_detector_dims), m_roi_dims(other.m_roi_dims)
{
diff --git a/Core/Instrument/Instrument.cpp b/Core/Instrument/Instrument.cpp
index 2745674be65..8a08b00fe62 100644
--- a/Core/Instrument/Instrument.cpp
+++ b/Core/Instrument/Instrument.cpp
@@ -27,7 +27,7 @@ Instrument::Instrument() : mP_detector(new SphericalDetector), m_beam(Beam::hori
registerChild(&m_beam);
}
-Instrument::Instrument(const Instrument& other) : m_beam(other.m_beam)
+Instrument::Instrument(const Instrument& other) : INode(), m_beam(other.m_beam)
{
if (other.mP_detector)
setDetector(*other.mP_detector);
diff --git a/Core/SampleBuilderEngine/SampleProvider.cpp b/Core/SampleBuilderEngine/SampleProvider.cpp
index bc66428e7dc..786c8b7f476 100644
--- a/Core/SampleBuilderEngine/SampleProvider.cpp
+++ b/Core/SampleBuilderEngine/SampleProvider.cpp
@@ -19,6 +19,7 @@
SampleProvider::SampleProvider() {}
SampleProvider::SampleProvider(const SampleProvider& other)
+ : INode()
{
if (other.m_multilayer)
setSample(*other.m_multilayer);
--
GitLab