From 049a3a33e2589eb21a9475b8dcfa55a0e5f2e22f Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Sun, 18 Oct 2015 21:56:50 +0100
Subject: [PATCH] Refs #13872 Fix some clang warnings
---
Framework/Crystal/src/SetSpecialCoordinates.cpp | 4 ++--
Framework/Geometry/src/MDGeometry/UnknownFrame.cpp | 2 +-
Framework/MDAlgorithms/test/IntegratePeaksMDTest.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Framework/Crystal/src/SetSpecialCoordinates.cpp b/Framework/Crystal/src/SetSpecialCoordinates.cpp
index 17969673f43..492e5840cb7 100644
--- a/Framework/Crystal/src/SetSpecialCoordinates.cpp
+++ b/Framework/Crystal/src/SetSpecialCoordinates.cpp
@@ -90,7 +90,7 @@ void SetSpecialCoordinates::init() {
}
bool SetSpecialCoordinates::writeCoordinatesToMDEventWorkspace(
- Workspace_sptr inWS, SpecialCoordinateSystem coordinateSystem) {
+ Workspace_sptr inWS, SpecialCoordinateSystem) {
bool written = false;
if (auto mdEventWS = boost::dynamic_pointer_cast<IMDEventWorkspace>(inWS)) {
g_log.warning("SetSpecialCoordinates: This algorithm cannot set the "
@@ -102,7 +102,7 @@ bool SetSpecialCoordinates::writeCoordinatesToMDEventWorkspace(
}
bool SetSpecialCoordinates::writeCoordinatesToMDHistoWorkspace(
- Workspace_sptr inWS, SpecialCoordinateSystem coordinateSystem) {
+ Workspace_sptr inWS, SpecialCoordinateSystem) {
bool written = false;
if (auto mdHistoWS = boost::dynamic_pointer_cast<IMDHistoWorkspace>(inWS)) {
g_log.warning("SetSpecialCoordinates: This algorithm cannot set the "
diff --git a/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp b/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp
index 20baef37de6..435f7edf7cd 100644
--- a/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp
+++ b/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp
@@ -13,7 +13,7 @@ UnknownFrame::~UnknownFrame() {}
const std::string UnknownFrame::UnknownFrameName = "Unknown frame";
-bool UnknownFrame::canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const {
+bool UnknownFrame::canConvertTo(const Mantid::Kernel::MDUnit&) const {
return false; // Cannot convert since it is unknown
}
diff --git a/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h b/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h
index 8dae71650dc..63ffbc0e15c 100644
--- a/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h
+++ b/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h
@@ -132,9 +132,9 @@ public:
MDEventWorkspace3Lean::sptr mdews =
AnalysisDataService::Instance().retrieveWS<MDEventWorkspace3Lean>(
"IntegratePeaksMDTest_MDEWS");
- mdews->setCoordinateSystem(Mantid::Kernel::HKL);
auto &frame = mdews->getDimension(0)->getMDFrame();
-
+ TSM_ASSERT_THROWS_NOTHING(
+ "Should be HKL", dynamic_cast<const Mantid::Geometry::HKL &>(frame));
TS_ASSERT_EQUALS(mdews->getNPoints(), 3000);
TS_ASSERT_DELTA(mdews->getBox()->getSignal(), 3000.0, 1e-2);
--
GitLab