From a376e24bec10f36f4ac3126430348a13713a447a Mon Sep 17 00:00:00 2001
From: Jose Borreguero <borreguero@gmail.com>
Date: Fri, 3 Aug 2018 11:08:38 -0400
Subject: [PATCH] Refs #23175 Apply clang patch
---
.../Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h | 5 +++--
Framework/Algorithms/src/AppendSpectra.cpp | 6 ++++--
Framework/Algorithms/src/ConjoinWorkspaces.cpp | 6 ++++--
Framework/Algorithms/src/WorkspaceJoiners.cpp | 5 +++--
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h b/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
index ea6bad10efd..087a426114d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
@@ -52,8 +52,9 @@ public:
protected:
API::MatrixWorkspace_sptr execWS2D(const API::MatrixWorkspace &ws1,
const API::MatrixWorkspace &ws2);
- API::MatrixWorkspace_sptr execEvent(const DataObjects::EventWorkspace &event_ws1,
- const DataObjects::EventWorkspace &event_ws2);
+ API::MatrixWorkspace_sptr
+ execEvent(const DataObjects::EventWorkspace &event_ws1,
+ const DataObjects::EventWorkspace &event_ws2);
using Mantid::API::Algorithm::validateInputs;
void validateInputs(const API::MatrixWorkspace &ws1,
diff --git a/Framework/Algorithms/src/AppendSpectra.cpp b/Framework/Algorithms/src/AppendSpectra.cpp
index fa86eae8201..8b76af15f72 100644
--- a/Framework/Algorithms/src/AppendSpectra.cpp
+++ b/Framework/Algorithms/src/AppendSpectra.cpp
@@ -60,8 +60,10 @@ void AppendSpectra::exec() {
// Retrieve the input workspaces
MatrixWorkspace_const_sptr ws1 = getProperty("InputWorkspace1");
MatrixWorkspace_const_sptr ws2 = getProperty("InputWorkspace2");
- DataObjects::EventWorkspace_const_sptr event_ws1 = boost::dynamic_pointer_cast<const EventWorkspace>(ws1);
- DataObjects::EventWorkspace_const_sptr event_ws2 = boost::dynamic_pointer_cast<const EventWorkspace>(ws2);
+ DataObjects::EventWorkspace_const_sptr event_ws1 =
+ boost::dynamic_pointer_cast<const EventWorkspace>(ws1);
+ DataObjects::EventWorkspace_const_sptr event_ws2 =
+ boost::dynamic_pointer_cast<const EventWorkspace>(ws2);
// Make sure that we are not mis-matching EventWorkspaces and other types of
// workspaces
diff --git a/Framework/Algorithms/src/ConjoinWorkspaces.cpp b/Framework/Algorithms/src/ConjoinWorkspaces.cpp
index 29ba6e01b9e..f7397666c02 100644
--- a/Framework/Algorithms/src/ConjoinWorkspaces.cpp
+++ b/Framework/Algorithms/src/ConjoinWorkspaces.cpp
@@ -46,8 +46,10 @@ void ConjoinWorkspaces::exec() {
// Retrieve the input workspaces
MatrixWorkspace_const_sptr ws1 = getProperty("InputWorkspace1");
MatrixWorkspace_const_sptr ws2 = getProperty("InputWorkspace2");
- DataObjects::EventWorkspace_const_sptr event_ws1 = boost::dynamic_pointer_cast<const EventWorkspace>(ws1);
- DataObjects::EventWorkspace_const_sptr event_ws2 = boost::dynamic_pointer_cast<const EventWorkspace>(ws2);
+ DataObjects::EventWorkspace_const_sptr event_ws1 =
+ boost::dynamic_pointer_cast<const EventWorkspace>(ws1);
+ DataObjects::EventWorkspace_const_sptr event_ws2 =
+ boost::dynamic_pointer_cast<const EventWorkspace>(ws2);
// Make sure that we are not mis-matching EventWorkspaces and other types of
// workspaces
diff --git a/Framework/Algorithms/src/WorkspaceJoiners.cpp b/Framework/Algorithms/src/WorkspaceJoiners.cpp
index 0131b2e4f1f..fd9cd712e14 100644
--- a/Framework/Algorithms/src/WorkspaceJoiners.cpp
+++ b/Framework/Algorithms/src/WorkspaceJoiners.cpp
@@ -118,8 +118,9 @@ MatrixWorkspace_sptr WorkspaceJoiners::execWS2D(const MatrixWorkspace &ws1,
* @throw std::invalid_argument If the input workspaces do not meet the
* requirements of this algorithm
*/
-MatrixWorkspace_sptr WorkspaceJoiners::execEvent(const DataObjects::EventWorkspace &event_ws1,
- const DataObjects::EventWorkspace &event_ws2) {
+MatrixWorkspace_sptr
+WorkspaceJoiners::execEvent(const DataObjects::EventWorkspace &event_ws1,
+ const DataObjects::EventWorkspace &event_ws2) {
// Create the output workspace
const size_t totalHists =
event_ws1.getNumberHistograms() + event_ws2.getNumberHistograms();
--
GitLab