From e73d6fa8272891e7bcc6e11a47b35d6b356fa6f0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sat, 17 Oct 2020 16:53:02 +0200
Subject: [PATCH] Simulation::m_distribution_handler now private
---
Core/Simulation/Simulation.cpp | 2 +-
Core/Simulation/Simulation.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index e30fa5b2a6b..132a88500e4 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -112,7 +112,7 @@ Simulation::Simulation()
Simulation::Simulation(const Simulation& other)
: ICloneable(), INode(), m_sample_provider(other.m_sample_provider), m_options(other.m_options),
- m_distribution_handler(other.m_distribution_handler), m_progress(other.m_progress),
+ m_progress(other.m_progress), m_distribution_handler(other.m_distribution_handler),
m_instrument(other.instrument())
{
if (other.mP_background)
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index dec9b579c23..9f0be80cbb7 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -119,7 +119,6 @@ protected:
SampleProvider m_sample_provider;
SimulationOptions m_options;
- DistributionHandler m_distribution_handler;
ProgressHandler m_progress;
std::unique_ptr<IBackground> mP_background;
@@ -152,6 +151,7 @@ private:
virtual std::vector<double> rawResults() const = 0;
virtual void setRawResults(const std::vector<double>& raw_data) = 0;
+ DistributionHandler m_distribution_handler;
Instrument m_instrument;
};
--
GitLab