From 253e0deda8d7c285d66b1d38cf08325aa57ad6f1 Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Fri, 9 Oct 2015 12:38:42 +0100
Subject: [PATCH] Refs #13872 Fix clang issue
---
.../MantidDataObjects/MDFramesToSpecialCoordinateSystem.h | 7 ++++---
Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h | 3 ++-
.../inc/MantidGeometry/MDGeometry/MDFrameFactory.h | 1 -
.../inc/MantidGeometry/MDGeometry/MDHistoDimension.h | 5 ++---
.../Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h | 6 ++++--
Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp | 3 +--
.../TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h | 3 ++-
7 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h b/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h
index 3dc876fd471..e302a160a27 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDFramesToSpecialCoordinateSystem.h
@@ -35,9 +35,10 @@ namespace DataObjects {
*/
class DLLExport MDFramesToSpecialCoordinateSystem {
public:
- MDFramesToSpecialCoordinateSystem ();
- ~MDFramesToSpecialCoordinateSystem ();
- boost::optional<Mantid::Kernel::SpecialCoordinateSystem> operator()(const Mantid::API::IMDWorkspace* workspace) const;
+ MDFramesToSpecialCoordinateSystem();
+ ~MDFramesToSpecialCoordinateSystem();
+ boost::optional<Mantid::Kernel::SpecialCoordinateSystem>
+ operator()(const Mantid::API::IMDWorkspace *workspace) const;
private:
Mantid::Kernel::SpecialCoordinateSystem extractCoordinateSystem(
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
index 9b2234b5267..35f424eecc1 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
@@ -41,7 +41,8 @@ public:
virtual const Mantid::Kernel::MDUnit &getMDUnit() const = 0;
virtual bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const = 0;
virtual std::string name() const = 0;
- virtual Mantid::Kernel::SpecialCoordinateSystem equivalientSpecialCoordinateSystem() const= 0;
+ virtual Mantid::Kernel::SpecialCoordinateSystem
+ equivalientSpecialCoordinateSystem() const = 0;
virtual MDFrame *clone() const = 0;
virtual ~MDFrame() {}
};
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
index bf09984478c..d39e786edbe 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
@@ -108,7 +108,6 @@ public:
bool canInterpret(const MDFrameArgument &argument) const;
};
-
/// Make a complete factory chain
MDFrameFactory_uptr MANTID_GEOMETRY_DLL makeMDFrameFactoryChain();
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
index e4876d85455..b1f79d2c1cb 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
@@ -34,9 +34,8 @@ public:
MDHistoDimension(std::string name, std::string ID,
const Kernel::UnitLabel &units, coord_t min, coord_t max,
size_t numBins)
- : m_name(name), m_dimensionId(ID),
- m_frame(new UnknownFrame(units)), m_min(min),
- m_max(max), m_numBins(numBins),
+ : m_name(name), m_dimensionId(ID), m_frame(new UnknownFrame(units)),
+ m_min(min), m_max(max), m_numBins(numBins),
m_binWidth((max - min) / static_cast<coord_t>(numBins)) {
if (max < min) {
throw std::invalid_argument("Error making MDHistoDimension. Cannot have "
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
index c3427e79838..2500e39c6f7 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
@@ -40,13 +40,15 @@ public:
UnknownFrame(const Kernel::UnitLabel &unit);
virtual ~UnknownFrame();
std::string name() const;
- bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const ;
+ bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const;
Mantid::Kernel::UnitLabel getUnitLabel() const;
const Mantid::Kernel::MDUnit &getMDUnit() const;
- Mantid::Kernel::SpecialCoordinateSystem equivalientSpecialCoordinateSystem() const;
+ Mantid::Kernel::SpecialCoordinateSystem
+ equivalientSpecialCoordinateSystem() const;
UnknownFrame *clone() const;
// Type name
static const std::string UnknownFrameName;
+
private:
/// Label unit
const std::unique_ptr<Mantid::Kernel::MDUnit> m_unit;
diff --git a/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp b/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp
index 5cc6910e079..2726cddd92c 100644
--- a/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDFrameFactory.cpp
@@ -65,8 +65,7 @@ bool HKLFrameFactory::canInterpret(const MDFrameArgument &argument) const {
return argument.frameString == HKL::HKLName && compatibleUnit;
}
-
-UnknownFrame*
+UnknownFrame *
UnknownFrameFactory::createRaw(const MDFrameArgument &argument) const {
using namespace Mantid::Kernel;
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
index d488cc72675..184efffe6ee 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
@@ -215,7 +215,8 @@ makeAnyMDEWWithFrames(size_t splitInto, coord_t min, coord_t max,
auto out = createOutputWorkspace<MDE, nd>(splitInto);
// Add standard dimensions
- addMDDimensionsWithFrames<MDE, nd>(out, min, max, frame, axisNameFormat, axisIdFormat);
+ addMDDimensionsWithFrames<MDE, nd>(out, min, max, frame, axisNameFormat,
+ axisIdFormat);
// Add data
addData<MDE, nd>(out, splitInto, min, max, numEventsPerBox, wsName);
--
GitLab