Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
103846cd
Commit
103846cd
authored
May 27, 2020
by
Stephen
Browse files
Fix various warnings
Fix various memory warnings and clang format
parent
5c947c51
Changes
4
Hide whitespace changes
Inline
Side-by-side
Framework/DataHandling/inc/MantidDataHandling/DataBlockGenerator.h
View file @
103846cd
...
...
@@ -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
;
};
...
...
Framework/DataHandling/src/DataBlockGenerator.cpp
View file @
103846cd
...
...
@@ -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
Framework/DataHandling/src/LoadMuonNexus1.cpp
View file @
103846cd
...
...
@@ -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
();)
{
...
...
Framework/DataHandling/src/LoadMuonNexus2.cpp
View file @
103846cd
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment