Commit 103846cd authored by Stephen's avatar Stephen
Browse files

Fix various warnings

Fix various memory warnings and clang format
parent 5c947c51
......@@ -25,12 +25,12 @@ public:
DataBlockGenerator &operator++();
DataBlockGenerator operator++(int);
bool isDone();
int64_t getValue();
specnum_t getValue();
void next();
public:
std::vector<spectrumPair> m_intervals;
int64_t m_currentSpectrum;
specnum_t m_currentSpectrum;
boost::optional<size_t> m_currentIntervalIndex;
};
......
......@@ -81,6 +81,6 @@ void DataBlockGenerator::next() { ++(*this); }
bool DataBlockGenerator::isDone() { return !m_currentIntervalIndex; }
int64_t DataBlockGenerator::getValue() { return m_currentSpectrum; }
specnum_t DataBlockGenerator::getValue() { return m_currentSpectrum; }
} // namespace DataHandling
} // namespace Mantid
......@@ -151,7 +151,7 @@ void LoadMuonNexus1::exec() {
checkOptionalProperties();
// Calculate the size of a workspace, given its number of periods & spectra to
// read
size_t total_specs;
int64_t total_specs;
if (m_interval || m_list) {
// Remove from list possible duplicate specs
for (auto it = m_spec_list.begin(); it != m_spec_list.end();) {
......
......@@ -13,6 +13,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidDataHandling/LoadMuonNexus1.h"
#include "MantidDataHandling/LoadMuonNexusV2.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidKernel/ArrayProperty.h"
......@@ -32,7 +33,6 @@
#include <cmath>
#include <numeric>
#include <MantidDataHandling\LoadMuonNexusV2.h>
using Mantid::Types::Core::DateAndTime;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment