From a352421e4f92e7ae7f0e590944ceaa9b61c0f915 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Tue, 24 Mar 2020 16:33:13 -0400
Subject: [PATCH] Get NexusFileLoader to build
Signed-off-by: Steven Hahn <hahnse@ornl.gov>
---
.../inc/MantidDataHandling/NexusFileLoader.h | 21 ++++++++-----------
.../DataHandling/src/NexusFileLoader.cpp | 19 ++++++++++-------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
index 3d5b38970e9..730097ec1ee 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
@@ -10,23 +10,20 @@
#include "MantidKernel/System.h"
#include "MantidNexus/NexusHDF5Descriptor.h"
-namespace Mantid {
-namespace API {
+namespace Mantid::DataHandling {
class DLLExport NexusFileLoader
- : public IFileLoader<Mantid::Nexus::NexusHDF5Descriptor> {
+ : public API::IFileLoader<Mantid::NeXus::NexusHDF5Descriptor> {
public:
void exec() override;
- void createChildAlgorithm(const std::string &name,
- const double startProgress = -1.,
- const double endProgress = -1.,
- const bool enableLogging = true,
- const int &version = -1) override;
+ boost::shared_ptr<Algorithm> createChildAlgorithm(
+ const std::string &name, const double startProgress = -1.,
+ const double endProgress = -1., const bool enableLogging = true,
+ const int &version = -1) override;
void
- setFileInfo(std::shared_ptr<Mantid::Nexus::NexusHDF5Descriptor> fileInfo);
+ setFileInfo(std::shared_ptr<Mantid::NeXus::NexusHDF5Descriptor> fileInfo);
private:
- std::shared_ptr<Mantid::Nexus::NexusHDF5Descriptor> m_fileInfo;
+ std::shared_ptr<Mantid::NeXus::NexusHDF5Descriptor> m_fileInfo;
};
-} // namespace API
-} // namespace Mantid
+} // namespace Mantid::DataHandling
diff --git a/Framework/DataHandling/src/NexusFileLoader.cpp b/Framework/DataHandling/src/NexusFileLoader.cpp
index f857b7812fc..9bcbee1ac9a 100644
--- a/Framework/DataHandling/src/NexusFileLoader.cpp
+++ b/Framework/DataHandling/src/NexusFileLoader.cpp
@@ -8,13 +8,16 @@
namespace Mantid::DataHandling {
void NexusFileLoader::exec() {}
- void createChildAlgorithm(const std::string &name,
- const double startProgress,
- const double endProgress,
- const bool enableLogging,
- const int &version) {}
- void
- setFileInfo(std::shared_ptr<Mantid::Nexus::NexusHDF5Descriptor> fileInfo) {
- m_fileinfo = std::move(fileInfo);
+ boost::shared_ptr<Mantid::API::Algorithm>
+ NexusFileLoader::createChildAlgorithm(const std::string &name,
+ const double startProgress,
+ const double endProgress,
+ const bool enableLogging,
+ const int &version) {
+ return nullptr;
+ }
+ void NexusFileLoader::setFileInfo(
+ std::shared_ptr<Mantid::NeXus::NexusHDF5Descriptor> fileInfo) {
+ m_fileInfo = std::move(fileInfo);
}
}
--
GitLab