From 814fdb8e0cbf83bcb041e662e194cc807688e613 Mon Sep 17 00:00:00 2001
From: LamarMoore <lamar.moore@stfc.ac.uk>
Date: Fri, 22 Sep 2017 13:41:05 +0100
Subject: [PATCH] clang format #20523
---
Framework/API/test/AlgorithmHistoryTest.h | 3 +--
Framework/DataHandling/src/LoadEventNexus.cpp | 7 +++----
Framework/DataHandling/src/LoadLog.cpp | 3 +--
Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp | 5 ++---
Framework/Nexus/inc/MantidNexus/NexusClasses.h | 2 +-
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/Framework/API/test/AlgorithmHistoryTest.h b/Framework/API/test/AlgorithmHistoryTest.h
index c12510f17ed..5798d9547a0 100644
--- a/Framework/API/test/AlgorithmHistoryTest.h
+++ b/Framework/API/test/AlgorithmHistoryTest.h
@@ -203,8 +203,7 @@ private:
timeinfo->tm_min = 54;
timeinfo->tm_sec = 49;
// Convert to time_t but assuming the tm is specified in UTC time.
- std::time_t execTime_t =
- Mantid::Kernel::DateAndTime::utc_mktime(timeinfo);
+ std::time_t execTime_t = Mantid::Kernel::DateAndTime::utc_mktime(timeinfo);
// Create a UTC datetime from it
Mantid::Kernel::DateAndTime execTime;
execTime.set_from_time_t(execTime_t);
diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp
index bc925e37bd9..9b2806ebd75 100644
--- a/Framework/DataHandling/src/LoadEventNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -1610,10 +1610,9 @@ void LoadEventNexus::loadEvents(API::Progress *const prog,
g_log.warning() << "The shortest TOF was negative! At least 1 event has an "
"invalid time-of-flight.\n";
if (bad_tofs > 0)
- g_log.warning() << "Found " << bad_tofs
- << " events with TOF > 2e8. This "
- "may indicate errors in the raw "
- "TOF data.\n";
+ g_log.warning() << "Found " << bad_tofs << " events with TOF > 2e8. This "
+ "may indicate errors in the raw "
+ "TOF data.\n";
// Use T0 offset from TOPAZ Parameter file if it exists
if (m_ws->getInstrument()->hasParameter("T0")) {
diff --git a/Framework/DataHandling/src/LoadLog.cpp b/Framework/DataHandling/src/LoadLog.cpp
index cb5d55107b8..ef50c84e5dc 100644
--- a/Framework/DataHandling/src/LoadLog.cpp
+++ b/Framework/DataHandling/src/LoadLog.cpp
@@ -201,8 +201,7 @@ void LoadLog::loadThreeColumnLogFile(std::ifstream &logFileStream,
std::map<std::string, std::unique_ptr<Kernel::TimeSeriesProperty<double>>>
dMap;
std::map<std::string,
- std::unique_ptr<Kernel::TimeSeriesProperty<std::string>>>
- sMap;
+ std::unique_ptr<Kernel::TimeSeriesProperty<std::string>>> sMap;
kind l_kind(LoadLog::empty);
bool isNumeric(false);
diff --git a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
index 57d788447aa..0c318fc3885 100644
--- a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
+++ b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
@@ -211,7 +211,7 @@ bool KafkaEventStreamDecoder::hasReachedEndOfRun() noexcept {
*/
API::Workspace_sptr KafkaEventStreamDecoder::extractData() {
if (m_exception) {
- throw *m_exception;
+ throw * m_exception;
}
m_extractWaiting = true;
@@ -384,8 +384,7 @@ void KafkaEventStreamDecoder::initLocalCaches() {
std::ostringstream os;
os << "KafkaEventStreamDecoder::initLocalEventBuffer() - Invalid "
"spectra/detector mapping. Expected matched length arrays but "
- "found nspec="
- << nspec << ", ndet=" << nudet;
+ "found nspec=" << nspec << ", ndet=" << nudet;
throw std::runtime_error(os.str());
}
// Create buffer
diff --git a/Framework/Nexus/inc/MantidNexus/NexusClasses.h b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
index 75d02031cd8..58d42e5d209 100644
--- a/Framework/Nexus/inc/MantidNexus/NexusClasses.h
+++ b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
@@ -258,7 +258,7 @@ public:
* @throw range_error if the indeces point outside the buffer.
* @return A reference to the value
*/
- T &operator()(int i, int j) const { return this->operator[](i *dim1() + j); }
+ T &operator()(int i, int j) const { return this->operator[](i * dim1() + j); }
/** Returns a value assuming the data is a tree-dimensional array
* @param i :: The index along dim0()
* @param j :: The index along dim1()
--
GitLab