From bcf69a8cb6b79741f1fcf8e41a3d112d378fcacb Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Tue, 6 Nov 2018 14:14:42 -0500
Subject: [PATCH] make the code compile
---
.../DataObjects/inc/MantidDataObjects/EventWorkspace.h | 2 +-
Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
index 270b697a9ff..4c3daf5d0e4 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
@@ -92,7 +92,7 @@ public:
Mantid::Types::Core::DateAndTime
getTimeAtSampleMax(double tofOffset = 0) const override;
- double getEventMatrixWorkXMin() const;
+ double getEventXMin() const;
double getEventXMax() const;
void getEventXMinMax(double &xmin, double &xmax) const;
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h b/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h
index d6f3098374c..69c47b0dba7 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/FakeObjects.h
@@ -199,7 +199,7 @@ protected:
throw std::runtime_error(
"Cloning of AxeslessWorkspaceTester is not implemented.");
}
-
+public:
bool isCommonBins() const override {
if (!m_isCommonBinsFlagSet) {
m_isCommonBinsFlag = true;
@@ -208,9 +208,9 @@ protected:
// error
if (numHist > 1) {
// First check if the x-axis shares a common cow_ptr.
- auto first = data[0]->ptrX();
- for (const auto &st : data) {
- if (st->ptrX() != first) {
+ auto first = m_vec[0].ptrX();
+ for (const auto &st : m_vec) {
+ if (st.ptrX() != first) {
m_isCommonBinsFlag = false;
break;
}
--
GitLab