From 71b0d278be43fcbcf8277267a5bbeb02d1bc2b15 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Tue, 24 Mar 2020 15:51:41 -0400
Subject: [PATCH] Rename to NexusHDF5Descriptor
Signed-off-by: Steven Hahn <hahnse@ornl.gov>
---
.../inc/MantidDataHandling/NexusFileLoader.h | 11 +++++++----
Framework/DataHandling/src/NexusFileLoader.cpp | 6 ++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
index 3eb6faeac33..3d5b38970e9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
@@ -7,13 +7,14 @@
#pragma once
#include "MantidAPI/IFileLoader.h"
-#include "MantidNexus/HDF5Descriptor.h"
#include "MantidKernel/System.h"
+#include "MantidNexus/NexusHDF5Descriptor.h"
namespace Mantid {
namespace API {
-class DLLExport NexusFileLoader : public IFileLoader<Mantid::Nexus::HDF5Descriptor> {
+class DLLExport NexusFileLoader
+ : public IFileLoader<Mantid::Nexus::NexusHDF5Descriptor> {
public:
void exec() override;
void createChildAlgorithm(const std::string &name,
@@ -21,9 +22,11 @@ public:
const double endProgress = -1.,
const bool enableLogging = true,
const int &version = -1) override;
- void setFileInfo(std::shared_ptr<Mantid::Nexus::HDF5Descriptor> fileInfo);
+ void
+ setFileInfo(std::shared_ptr<Mantid::Nexus::NexusHDF5Descriptor> fileInfo);
+
private:
- std::shared_ptr<Mantid::Nexus::HDF5Descriptor> m_fileInfo;
+ std::shared_ptr<Mantid::Nexus::NexusHDF5Descriptor> m_fileInfo;
};
} // namespace API
} // namespace Mantid
diff --git a/Framework/DataHandling/src/NexusFileLoader.cpp b/Framework/DataHandling/src/NexusFileLoader.cpp
index 1816b8b0475..f857b7812fc 100644
--- a/Framework/DataHandling/src/NexusFileLoader.cpp
+++ b/Framework/DataHandling/src/NexusFileLoader.cpp
@@ -13,6 +13,8 @@ namespace Mantid::DataHandling {
const double endProgress,
const bool enableLogging,
const int &version) {}
- void setFileInfo(std::shared_ptr<Mantid::Nexus::HDF5Descriptor> fileInfo)
- {}
+ void
+ setFileInfo(std::shared_ptr<Mantid::Nexus::NexusHDF5Descriptor> fileInfo) {
+ m_fileinfo = std::move(fileInfo);
+ }
}
--
GitLab