From ca7fad8b0d2284d023ba530bd6e581ea16c52dad Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Fri, 23 Oct 2015 11:24:11 +0100
Subject: [PATCH] Re #14022 Mean Clang
---
Framework/API/src/MatrixWorkspace.cpp | 10 +++++-----
.../mantid/api/src/Exports/MatrixWorkspace.cpp | 5 ++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Framework/API/src/MatrixWorkspace.cpp b/Framework/API/src/MatrixWorkspace.cpp
index 053fde6811c..0d523b4a07c 100644
--- a/Framework/API/src/MatrixWorkspace.cpp
+++ b/Framework/API/src/MatrixWorkspace.cpp
@@ -1135,11 +1135,11 @@ MatrixWorkspace::maskedBins(const size_t &workspaceIndex) const {
*/
void MatrixWorkspace::setMonitorWorkspace(
const boost::shared_ptr<MatrixWorkspace> &monitorWS) {
- if (monitorWS.get() == this) {
- throw std::runtime_error(
- "To avoid memory leak, monitor workspace"
- " can not be the same workspace as the host workspace");
- }
+ if (monitorWS.get() == this) {
+ throw std::runtime_error(
+ "To avoid memory leak, monitor workspace"
+ " can not be the same workspace as the host workspace");
+ }
m_monitorWorkspace = monitorWS;
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 288d897dd37..2f6cdb9bddc 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -93,7 +93,7 @@ void setMonitorWorkspace(MatrixWorkspace &self,
}
/**
* @param self :: A reference to the calling object
-*
+*
*@return weak pointer to monitor workspace used by python
*/
boost::weak_ptr<Workspace> getMonitorWorkspace(MatrixWorkspace &self) {
@@ -351,8 +351,7 @@ void export_MatrixWorkspace() {
"Performs a comparison operation on two workspaces, using the "
"CheckWorkspacesMatch algorithm")
//--------- monitor workspace --------------------------------------
- .def("getMonitorWorkspace", &getMonitorWorkspace,
- args("self"),
+ .def("getMonitorWorkspace", &getMonitorWorkspace, args("self"),
"Return internal monitor workspace bound to current workspace.")
.def("setMonitorWorkspace", &setMonitorWorkspace,
args("self", "MonitorWS"),
--
GitLab