From 72368ffbc4d3a827c6be7940582fa48fad045c4f Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Tue, 11 Dec 2018 14:06:43 +0000
Subject: [PATCH] Re #23103 clang formatting
---
Framework/API/inc/MantidAPI/Algorithm.h | 6 ++++--
Framework/Kernel/inc/MantidKernel/ConfigService.h | 2 +-
Framework/Kernel/src/ConfigService.cpp | 7 +++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/Algorithm.h b/Framework/API/inc/MantidAPI/Algorithm.h
index 912bc7b1738..22c0052248a 100644
--- a/Framework/API/inc/MantidAPI/Algorithm.h
+++ b/Framework/API/inc/MantidAPI/Algorithm.h
@@ -442,14 +442,16 @@ private:
// --------------------- Private Members -----------------------------------
/// Poco::ActiveMethod used to implement asynchronous execution.
std::unique_ptr<Poco::ActiveMethod<bool, Poco::Void, Algorithm,
- Poco::ActiveStarter<Algorithm>>> m_executeAsync;
+ Poco::ActiveStarter<Algorithm>>>
+ m_executeAsync;
/// Sends notifications to observers. Observers can subscribe to
/// notificationCenter
/// using Poco::NotificationCenter::addObserver(...);
mutable std::unique_ptr<Poco::NotificationCenter> m_notificationCenter;
/// Child algorithm progress observer
- mutable std::unique_ptr<Poco::NObserver<Algorithm, ProgressNotification>> m_progressObserver;
+ mutable std::unique_ptr<Poco::NObserver<Algorithm, ProgressNotification>>
+ m_progressObserver;
bool m_isInitialized; ///< Algorithm has been initialized flag
bool m_isExecuted; ///< Algorithm is executed flag
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index 5e9d462a498..7f220c2e7a8 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -16,10 +16,10 @@
#include <boost/optional/optional.hpp>
#include <map>
+#include <memory>
#include <set>
#include <string>
#include <vector>
-#include <memory>
#include <Poco/Notification.h>
#include <Poco/NotificationCenter.h>
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 34782f05e93..152ddb1f027 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -169,7 +169,8 @@ ConfigServiceImpl::ConfigServiceImpl()
m_DataSearchDirs(), m_UserSearchDirs(), m_InstrumentDirs(),
m_instr_prefixes(), m_proxyInfo(), m_isProxySet(false) {
// getting at system details
- m_pSysConfig =std::make_unique<WrappedObject<Poco::Util::SystemConfiguration>>();
+ m_pSysConfig =
+ std::make_unique<WrappedObject<Poco::Util::SystemConfiguration>>();
m_pConf = nullptr;
// Register StdChannel with Poco
@@ -426,7 +427,9 @@ void ConfigServiceImpl::loadConfig(const std::string &filename,
// use the cached property string to initialise the POCO property file
std::istringstream istr(m_PropertyString);
- m_pConf= std::make_unique<WrappedObject<Poco::Util::PropertyFileConfiguration>>(istr);
+ m_pConf =
+ std::make_unique<WrappedObject<Poco::Util::PropertyFileConfiguration>>(
+ istr);
}
/**
--
GitLab