From bad2c992a230df656bbf00565cd7c50bd17bcd75 Mon Sep 17 00:00:00 2001
From: Samuel Jones <samjones714@gmail.com>
Date: Tue, 20 Aug 2019 08:06:48 +0100
Subject: [PATCH] Re #26643 Fix BuildServer build errors OSX and Ubuntu Re
---
.../ISISReflectometry/GUI/Common/Decoder.cpp | 5 ++---
.../inc/MantidQtWidgets/Common/UserSubWindowFactory.h | 8 ++++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp
index 0ec7e526ca7..72fce981d13 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp
@@ -256,8 +256,7 @@ void Decoder::decodeRunsTable(QtRunsTableView *gui, ReductionJobs *redJobs,
updateRunsTableViewFromModel(gui, redJobs);
if (m_projectSave) {
- // Apply styling and restore completed state for output range values best
- // way to achieve this is yet to be decided.
+ // Apply styling and restore completed state for output range values
presenter->notifyRowOutputsChanged();
presenter->notifyRowStateChanged();
}
@@ -460,4 +459,4 @@ void Decoder::decodeEvent(const QtEventView *gui,
} // namespace ISISReflectometry
} // namespace CustomInterfaces
-} // namespace MantidQt
\ No newline at end of file
+} // namespace MantidQt
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h
index cbeafcf7df6..544ae97f513 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h
@@ -87,10 +87,10 @@ private:
// QHash doesn't seem to support std::unique_ptr<> as a valueso a std::map is
// used instead
std::map<std::string,
- std::unique_ptr<Mantid::Kernel::AbstractInstantiator<BaseEncoder>>>
+ std::shared_ptr<Mantid::Kernel::AbstractInstantiator<BaseEncoder>>>
m_encoders;
std::map<std::string,
- std::unique_ptr<Mantid::Kernel::AbstractInstantiator<BaseDecoder>>>
+ std::shared_ptr<Mantid::Kernel::AbstractInstantiator<BaseDecoder>>>
m_decoders;
};
@@ -114,11 +114,11 @@ void UserSubWindowFactoryImpl::subscribe(const std::string &decoderTag) {
subscribe<WindowType>();
m_encoders.insert(
{WindowType::name(),
- std::make_unique<
+ std::make_shared<
Mantid::Kernel::Instantiator<EncoderType, BaseEncoder>>()});
m_decoders.insert(
{decoderTag,
- std::make_unique<
+ std::make_shared<
Mantid::Kernel::Instantiator<DecoderType, BaseDecoder>>()});
}
--
GitLab