diff --git a/Framework/API/inc/MantidAPI/Algorithm.h b/Framework/API/inc/MantidAPI/Algorithm.h
index 4b7c6a50b85a280b0dff9b524cceb991a2a29dd8..8115702290f435c1799a47ed17d6563c9693d1bb 100644
--- a/Framework/API/inc/MantidAPI/Algorithm.h
+++ b/Framework/API/inc/MantidAPI/Algorithm.h
@@ -301,7 +301,7 @@ public:
/// parent object to fill.
void trackAlgorithmHistory(boost::shared_ptr<AlgorithmHistory> parentHist);
- using WorkspaceVector = std::vector<boost::shared_ptr<Workspace> >;
+ using WorkspaceVector = std::vector<boost::shared_ptr<Workspace>>;
void findWorkspaceProperties(WorkspaceVector &inputWorkspaces,
WorkspaceVector &outputWorkspaces) const;
diff --git a/Framework/API/inc/MantidAPI/AlgorithmFactory.h b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
index f5b04a3a072e8a4f1fec87511c0adfcf38a0c602..49ed56890b29e7b6a01f96d2c3e1c0fb72104c09 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmFactory.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
@@ -171,8 +171,10 @@ private:
using AlgorithmFactory = Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>;
/// Convenient typedef for an UpdateNotification
-using AlgorithmFactoryUpdateNotification = Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification;
-using AlgorithmFactoryUpdateNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification> &;
+using AlgorithmFactoryUpdateNotification =
+ Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification;
+using AlgorithmFactoryUpdateNotification_ptr = const Poco::AutoPtr<
+ Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification> &;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/AlgorithmHistory.h b/Framework/API/inc/MantidAPI/AlgorithmHistory.h
index b4275f3024875bc0f1497ca0e87a5d4973cf8134..4485f149f63683fc914c1c9af78212b1879dc0df 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmHistory.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmHistory.h
@@ -36,7 +36,8 @@ template <class T> struct CompareHistory {
// typedefs for algorithm history pointers
using AlgorithmHistory_sptr = boost::shared_ptr<AlgorithmHistory>;
using AlgorithmHistory_const_sptr = boost::shared_ptr<const AlgorithmHistory>;
-using AlgorithmHistories = std::set<AlgorithmHistory_sptr, Detail::CompareHistory<AlgorithmHistory> >;
+using AlgorithmHistories =
+ std::set<AlgorithmHistory_sptr, Detail::CompareHistory<AlgorithmHistory>>;
/** @class AlgorithmHistory AlgorithmHistory.h API/MAntidAPI/AlgorithmHistory.h
diff --git a/Framework/API/inc/MantidAPI/AnalysisDataService.h b/Framework/API/inc/MantidAPI/AnalysisDataService.h
index b8249697f377d3c0f4791c40192399a5dab3df2c..81847922571fe8cad12be09b373188510c9f4e29 100644
--- a/Framework/API/inc/MantidAPI/AnalysisDataService.h
+++ b/Framework/API/inc/MantidAPI/AnalysisDataService.h
@@ -178,37 +178,62 @@ private:
std::string m_illegalChars;
};
-using AnalysisDataService = Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>;
-
-using WorkspaceAddNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification;
-using WorkspaceAddNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification> &;
-
-using WorkspaceBeforeReplaceNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::BeforeReplaceNotification;
-using WorkspaceBeforeReplaceNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::BeforeReplaceNotification> &;
-
-using WorkspaceAfterReplaceNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::AfterReplaceNotification;
-using WorkspaceAfterReplaceNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::AfterReplaceNotification> &;
-
-using WorkspacePreDeleteNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification;
-using WorkspacePreDeleteNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification> &;
-
-using WorkspacePostDeleteNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification;
-using WorkspacePostDeleteNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification> &;
-
-using ClearADSNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification;
-using ClearADSNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification> &;
-
-using WorkspaceRenameNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification;
-using WorkspaceRenameNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification> &;
-
-using WorkspacesGroupedNotification = AnalysisDataServiceImpl::GroupWorkspacesNotification;
-using WorkspacesGroupedNotification_ptr = const Poco::AutoPtr<AnalysisDataServiceImpl::GroupWorkspacesNotification> &;
-
-using WorkspaceUnGroupingNotification = AnalysisDataServiceImpl::UnGroupingWorkspaceNotification;
-using WorkspaceUnGroupingNotification_ptr = const Poco::AutoPtr<AnalysisDataServiceImpl::UnGroupingWorkspaceNotification> &;
-
-using GroupUpdatedNotification = AnalysisDataServiceImpl::GroupUpdatedNotification;
-using GroupUpdatedNotification_ptr = const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification> &;
+using AnalysisDataService =
+ Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>;
+
+using WorkspaceAddNotification =
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification;
+using WorkspaceAddNotification_ptr = const Poco::AutoPtr<
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification> &;
+
+using WorkspaceBeforeReplaceNotification = Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::BeforeReplaceNotification;
+using WorkspaceBeforeReplaceNotification_ptr =
+ const Poco::AutoPtr<Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::BeforeReplaceNotification> &;
+
+using WorkspaceAfterReplaceNotification = Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::AfterReplaceNotification;
+using WorkspaceAfterReplaceNotification_ptr =
+ const Poco::AutoPtr<Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::AfterReplaceNotification> &;
+
+using WorkspacePreDeleteNotification =
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification;
+using WorkspacePreDeleteNotification_ptr =
+ const Poco::AutoPtr<Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::PreDeleteNotification> &;
+
+using WorkspacePostDeleteNotification =
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification;
+using WorkspacePostDeleteNotification_ptr =
+ const Poco::AutoPtr<Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::PostDeleteNotification> &;
+
+using ClearADSNotification =
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification;
+using ClearADSNotification_ptr = const Poco::AutoPtr<
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification> &;
+
+using WorkspaceRenameNotification =
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification;
+using WorkspaceRenameNotification_ptr = const Poco::AutoPtr<
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification> &;
+
+using WorkspacesGroupedNotification =
+ AnalysisDataServiceImpl::GroupWorkspacesNotification;
+using WorkspacesGroupedNotification_ptr =
+ const Poco::AutoPtr<AnalysisDataServiceImpl::GroupWorkspacesNotification> &;
+
+using WorkspaceUnGroupingNotification =
+ AnalysisDataServiceImpl::UnGroupingWorkspaceNotification;
+using WorkspaceUnGroupingNotification_ptr = const Poco::AutoPtr<
+ AnalysisDataServiceImpl::UnGroupingWorkspaceNotification> &;
+
+using GroupUpdatedNotification =
+ AnalysisDataServiceImpl::GroupUpdatedNotification;
+using GroupUpdatedNotification_ptr =
+ const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification> &;
} // Namespace API
} // Namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
index b3b4d06a6adab559b4d09ed456168c92f101901a..ff983a5556c867cee0ff18f857e617cd6446717b 100644
--- a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
+++ b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
@@ -56,7 +56,8 @@ private:
~ArchiveSearchFactoryImpl() override = default;
};
-using ArchiveSearchFactory = Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>;
+using ArchiveSearchFactory =
+ Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ConstraintFactory.h b/Framework/API/inc/MantidAPI/ConstraintFactory.h
index 3a738805e232132d448fe0cc83fe23e3b90cacf0..1b410289828059107a79ea65a50aae890e89cb1b 100644
--- a/Framework/API/inc/MantidAPI/ConstraintFactory.h
+++ b/Framework/API/inc/MantidAPI/ConstraintFactory.h
@@ -72,7 +72,8 @@ private:
~ConstraintFactoryImpl() override = default;
};
-using ConstraintFactory = Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>;
+using ConstraintFactory =
+ Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/CostFunctionFactory.h b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
index 68b367c1fc269aa7ee6570cda69c5755b92d755e..c03230c26d0c76ac321df6730c7ab61e533e5d8a 100644
--- a/Framework/API/inc/MantidAPI/CostFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
@@ -63,7 +63,8 @@ private:
CostFunctionFactoryImpl();
};
-using CostFunctionFactory = Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>;
+using CostFunctionFactory =
+ Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
index 90f667d54a6eb68f687d6c1dd8e0e01dbe3494a6..a8c9c4448bcd63f6dd431b41ac8cca9c335cdf43 100644
--- a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
+++ b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
@@ -73,7 +73,8 @@ private:
using Kernel::DynamicFactory<IDomainCreator>::createUnwrapped;
};
-using DomainCreatorFactory = Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>;
+using DomainCreatorFactory =
+ Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
index 0b6e1484a39c80e5b25cd043a340f70c5646f113..38cebdea415423e734f26a5a7086f2de2cb8ad71 100644
--- a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
+++ b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
@@ -144,7 +144,8 @@ private:
};
/// Type for the actual singleton instance
-using FileLoaderRegistry = Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>;
+using FileLoaderRegistry =
+ Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
index 576287f6417d7b3708e55b127e44c29ce73bbec0..79212a1a391a262eb85375eb0a291965bfb91cfb 100644
--- a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
+++ b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
@@ -61,7 +61,8 @@ private:
FuncMinimizerFactoryImpl();
};
-using FuncMinimizerFactory = Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>;
+using FuncMinimizerFactory =
+ Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/FunctionFactory.h b/Framework/API/inc/MantidAPI/FunctionFactory.h
index 1e6aa7e0d41479c5f3f5483064799e543a481636..1f88005af127a3e43ef2d76449806cb4feca7054 100644
--- a/Framework/API/inc/MantidAPI/FunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/FunctionFactory.h
@@ -145,9 +145,11 @@ const std::vector<std::string> &FunctionFactoryImpl::getFunctionNames() const {
using FunctionFactory = Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>;
/// Convenient typedef for an UpdateNotification
-using FunctionFactoryUpdateNotification = FunctionFactoryImpl::UpdateNotification;
+using FunctionFactoryUpdateNotification =
+ FunctionFactoryImpl::UpdateNotification;
/// Convenient typedef for an UpdateNotification AutoPtr
-using FunctionFactoryUpdateNotification_ptr = const Poco::AutoPtr<FunctionFactoryUpdateNotification> &;
+using FunctionFactoryUpdateNotification_ptr =
+ const Poco::AutoPtr<FunctionFactoryUpdateNotification> &;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h b/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
index fce242505cc207fa696646466e1d8abf96116205..0b24a04663ed8a60e415872224310a6d6e51042c 100644
--- a/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
+++ b/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
@@ -150,7 +150,8 @@ protected:
IFunction_sptr m_wrappedFunction;
};
-using FunctionParameterDecorator_sptr = boost::shared_ptr<FunctionParameterDecorator>;
+using FunctionParameterDecorator_sptr =
+ boost::shared_ptr<FunctionParameterDecorator>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/ISplittersWorkspace.h b/Framework/API/inc/MantidAPI/ISplittersWorkspace.h
index 495bf221eaff08b0e718a18535897e3456fe8fea..95fcecee9f7ea3d01103577573d26d46c1be4dc4 100644
--- a/Framework/API/inc/MantidAPI/ISplittersWorkspace.h
+++ b/Framework/API/inc/MantidAPI/ISplittersWorkspace.h
@@ -82,7 +82,8 @@ private:
/// Typedef for a shared pointer to \c TableWorkspace
using ISplittersWorkspace_sptr = boost::shared_ptr<ISplittersWorkspace>;
/// Typedef for a shared pointer to \c const \c TableWorkspace
-using ISplittersWorkspace_const_sptr = boost::shared_ptr<const ISplittersWorkspace>;
+using ISplittersWorkspace_const_sptr =
+ boost::shared_ptr<const ISplittersWorkspace>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
index c8cedde1fe216cb0f920c698f17a08d9f1705dcf..69c2261c00635fd8921e8b8c7bb3c3fa85b7f5a8 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
@@ -64,7 +64,8 @@ private:
~ImplicitFunctionFactoryImpl() override = default;
};
-using ImplicitFunctionFactory = Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>;
+using ImplicitFunctionFactory =
+ Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
index 234c5a8b1df56320512b802b3150a06f2866df2f..a769902c6477c51715f2fa70579f7778df242f96 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
@@ -81,7 +81,9 @@ class MANTID_API_DLL ImplicitFunctionParameterParser {
public:
/// Successor type. Unique shared pointer with stack scoped deletion
/// semantics.
- using SuccessorType = boost::interprocess::unique_ptr<ImplicitFunctionParameterParser, DeleterPolicy<ImplicitFunctionParameterParser> >;
+ using SuccessorType = boost::interprocess::unique_ptr<
+ ImplicitFunctionParameterParser,
+ DeleterPolicy<ImplicitFunctionParameterParser>>;
virtual ImplicitFunctionParameter *
createParameter(Poco::XML::Element *parameterElement) = 0;
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
index 6196d30601da363689543dcb5c98d1828c8a0537..7bf1cfd831ddaea4eb2e31c0efce2bf65ffe9a7f 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
@@ -62,7 +62,8 @@ private:
~ImplicitFunctionParameterParserFactoryImpl() override = default;
};
-using ImplicitFunctionParameterParserFactory = Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>;
+using ImplicitFunctionParameterParserFactory =
+ Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParser.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParser.h
index 4d0cf8e7892262cb1b0ed628268a95e5d0d963a4..4ad8da99e9b79dcf0fca5e29959831736052d995 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParser.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParser.h
@@ -68,7 +68,9 @@ namespace API {
class MANTID_API_DLL ImplicitFunctionParser {
public:
/// Successor type. Unique pointer with stack scoped deletion semantics.
- using SuccessorType = boost::interprocess::unique_ptr<ImplicitFunctionParser, DeleterPolicy<ImplicitFunctionParser> >;
+ using SuccessorType =
+ boost::interprocess::unique_ptr<ImplicitFunctionParser,
+ DeleterPolicy<ImplicitFunctionParser>>;
protected:
ImplicitFunctionParameterParser::SuccessorType
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
index 47b11ede76365a37a92120b80fa9d14e70270501..38219e7c9cd297dc3406137832babf1813a8d8c8 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
@@ -66,7 +66,8 @@ private:
~ImplicitFunctionParserFactoryImpl() override = default;
};
-using ImplicitFunctionParserFactory = Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>;
+using ImplicitFunctionParserFactory =
+ Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/InstrumentDataService.h b/Framework/API/inc/MantidAPI/InstrumentDataService.h
index 620e4ae2bd036dfcca66962d02a5ab9c785af5bd..f5d22334a71cdbabd1ed4038385d0c62bf040921 100644
--- a/Framework/API/inc/MantidAPI/InstrumentDataService.h
+++ b/Framework/API/inc/MantidAPI/InstrumentDataService.h
@@ -48,7 +48,8 @@ private:
operator=(const InstrumentDataServiceImpl &) = delete;
};
-using InstrumentDataService = Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>;
+using InstrumentDataService =
+ Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>;
} // Namespace API
} // Namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Framework/API/inc/MantidAPI/MatrixWorkspace.h
index 88a722256f8de7fe2133aeccbc798a5410105119..ad3657c215ddd708d1d344769899916b28c7367f 100644
--- a/Framework/API/inc/MantidAPI/MatrixWorkspace.h
+++ b/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -32,7 +32,7 @@ class Axis;
class SpectrumDetectorMapping;
/// typedef for the image type
-using MantidImage = std::vector<std::vector<double> >;
+using MantidImage = std::vector<std::vector<double>>;
/// shared pointer to MantidImage
using MantidImage_sptr = boost::shared_ptr<MantidImage>;
/// shared pointer to const MantidImage
diff --git a/Framework/API/inc/MantidAPI/MultipleExperimentInfos.h b/Framework/API/inc/MantidAPI/MultipleExperimentInfos.h
index e9f73c15048122b2d806ecbc491c764ad7e15c8c..a1eedc145f1ec5c711cdad360a9a1080f72c38a3 100644
--- a/Framework/API/inc/MantidAPI/MultipleExperimentInfos.h
+++ b/Framework/API/inc/MantidAPI/MultipleExperimentInfos.h
@@ -64,7 +64,8 @@ private:
};
using MultipleExperimentInfos_sptr = boost::shared_ptr<MultipleExperimentInfos>;
-using MultipleExperimentInfos_const_sptr = boost::shared_ptr<const MultipleExperimentInfos>;
+using MultipleExperimentInfos_const_sptr =
+ boost::shared_ptr<const MultipleExperimentInfos>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
index 664f5fef16bada4f6ee45ab71964167cd9e1d22f..e386c860b1cbd916ba81ed37ae88dca47c16d28a 100644
--- a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
+++ b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
@@ -87,7 +87,8 @@ private:
};
// The factory is just a specialisation of SingletonHolder
-using RemoteJobManagerFactory = Mantid::Kernel::SingletonHolder<RemoteJobManagerFactoryImpl>;
+using RemoteJobManagerFactory =
+ Mantid::Kernel::SingletonHolder<RemoteJobManagerFactoryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
index bc984a7e30afe183788dd3f0eb3d513536c46aa0..69c01aaa76b0c3e83c25c87095a6644b7bcd8401 100644
--- a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
+++ b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
@@ -67,7 +67,8 @@ private:
~ScriptRepositoryFactoryImpl() override = default;
};
-using ScriptRepositoryFactory = Mantid::Kernel::SingletonHolder<ScriptRepositoryFactoryImpl>;
+using ScriptRepositoryFactory =
+ Mantid::Kernel::SingletonHolder<ScriptRepositoryFactoryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/SpectraDetectorTypes.h b/Framework/API/inc/MantidAPI/SpectraDetectorTypes.h
index 5eb6843cceada49e9c441a906120f5a56891e85b..9c1bbce1b7bb8e9e63ed839df8a9b03cb9cb6569 100644
--- a/Framework/API/inc/MantidAPI/SpectraDetectorTypes.h
+++ b/Framework/API/inc/MantidAPI/SpectraDetectorTypes.h
@@ -14,7 +14,7 @@ using spec2index_map = std::unordered_map<specnum_t, size_t>;
/// Map with key = detector ID, value = workspace index
using detid2index_map = std::unordered_map<detid_t, size_t>;
/// Map single det ID of group to its members
-using det2group_map = std::unordered_map<detid_t, std::set<detid_t> >;
+using det2group_map = std::unordered_map<detid_t, std::set<detid_t>>;
}
#endif // MANTID_API_SPECTRADETECTORMAP_TYPES
diff --git a/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h b/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
index 5b37bd0df31f3a1467930cc2887dca691fa990ab..e8429fa25dfd7568c78e1de69406bf144b4b08eb 100644
--- a/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
+++ b/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
@@ -50,7 +50,7 @@ class MatrixWorkspace;
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class MANTID_API_DLL SpectrumDetectorMapping {
- using sdmap = std::unordered_map<specnum_t, std::set<detid_t> >;
+ using sdmap = std::unordered_map<specnum_t, std::set<detid_t>>;
public:
explicit SpectrumDetectorMapping(const MatrixWorkspace *const workspace,
diff --git a/Framework/API/inc/MantidAPI/TransformScaleFactory.h b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
index d34f27cf8819a03311aaabf7b12c5b354cf9d03b..7ec4daa8562cc6dec1a012947de35356a1d2f85f 100644
--- a/Framework/API/inc/MantidAPI/TransformScaleFactory.h
+++ b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
@@ -66,7 +66,8 @@ private:
// Do not use default methods
};
-using TransformScaleFactory = Mantid::Kernel::SingletonHolder<TransformScaleFactoryImpl>;
+using TransformScaleFactory =
+ Mantid::Kernel::SingletonHolder<TransformScaleFactoryImpl>;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/WorkspaceNearestNeighbours.h b/Framework/API/inc/MantidAPI/WorkspaceNearestNeighbours.h
index 1ca57f0e2426f288b5769a54befc4ed9d3a030de..1a071bf00963f63004e551d599b4951a86a9886c 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceNearestNeighbours.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceNearestNeighbours.h
@@ -82,7 +82,10 @@ private:
const std::vector<specnum_t> m_spectrumNumbers;
/// typedef for Graph object used to hold the calculated information
- using Graph = boost::adjacency_list<boost::vecS, boost::vecS, boost::directedS, boost::property<boost::vertex_name_t, int64_t>, boost::property<boost::edge_name_t, Mantid::Kernel::V3D> >;
+ using Graph = boost::adjacency_list<
+ boost::vecS, boost::vecS, boost::directedS,
+ boost::property<boost::vertex_name_t, int64_t>,
+ boost::property<boost::edge_name_t, Mantid::Kernel::V3D>>;
/// Vertex descriptor object for Graph
using Vertex = boost::graph_traits<Graph>::vertex_descriptor;
/// map object of int to Graph Vertex descriptor
diff --git a/Framework/API/src/MultiPeriodGroupWorker.cpp b/Framework/API/src/MultiPeriodGroupWorker.cpp
index 2c54d9839ff85175f981d2e6793c4ce4db8184f4..ff9e531ee5b71927ed38aa8acd646790b2514409 100644
--- a/Framework/API/src/MultiPeriodGroupWorker.cpp
+++ b/Framework/API/src/MultiPeriodGroupWorker.cpp
@@ -85,7 +85,7 @@ MultiPeriodGroupWorker::findMultiPeriodGroups(
vecWorkspaceGroups);
}
} else {
- using WorkspaceVector = std::vector<boost::shared_ptr<Workspace> >;
+ using WorkspaceVector = std::vector<boost::shared_ptr<Workspace>>;
WorkspaceVector inWorkspaces;
WorkspaceVector outWorkspaces;
sourceAlg->findWorkspaceProperties(inWorkspaces, outWorkspaces);
diff --git a/Framework/API/test/FermiChopperModelTest.h b/Framework/API/test/FermiChopperModelTest.h
index 90abb283ad8015607774e5bb43613f0719cb266c..195295e201b4f8e3012ee5000196417b200683ed 100644
--- a/Framework/API/test/FermiChopperModelTest.h
+++ b/Framework/API/test/FermiChopperModelTest.h
@@ -9,7 +9,8 @@
#include <boost/make_shared.hpp>
class FermiChopperModelTest : public CxxTest::TestSuite {
- using FermiChopperModel_sptr = boost::shared_ptr<Mantid::API::FermiChopperModel>;
+ using FermiChopperModel_sptr =
+ boost::shared_ptr<Mantid::API::FermiChopperModel>;
public:
void test_Default_Object_Throws_When_Computing_Pulse_Variance() {
diff --git a/Framework/API/test/IkedaCarpenterModeratorTest.h b/Framework/API/test/IkedaCarpenterModeratorTest.h
index c79e24b8254dd9339810ed8c91a735a59c88405c..7e21d119bb087e95816a584f162226e49b99170e 100644
--- a/Framework/API/test/IkedaCarpenterModeratorTest.h
+++ b/Framework/API/test/IkedaCarpenterModeratorTest.h
@@ -8,7 +8,8 @@
class IkedaCarpenterModeratorTest : public CxxTest::TestSuite {
public:
- using IkedaCarpenterModerator_sptr = boost::shared_ptr<Mantid::API::IkedaCarpenterModerator>;
+ using IkedaCarpenterModerator_sptr =
+ boost::shared_ptr<Mantid::API::IkedaCarpenterModerator>;
void test_Default_Object_Returns_Zero_Mean_Time() {
Mantid::API::IkedaCarpenterModerator ikmod;
diff --git a/Framework/API/test/VectorParameterParserTest.h b/Framework/API/test/VectorParameterParserTest.h
index 55c717ae044252efa618c59d870cfcb9f8cf67e1..68d06dd2bc305f0ab0cb15e7ef4364efdcaff2f2 100644
--- a/Framework/API/test/VectorParameterParserTest.h
+++ b/Framework/API/test/VectorParameterParserTest.h
@@ -15,13 +15,15 @@ private:
DECLARE_VECTOR_PARAMETER(ConcreteVectorDblParam, double)
// Declare a concrete vector parameter parser for testing.
- using ConcreteVectorDblParamParser = VectorParameterParser<ConcreteVectorDblParam>;
+ using ConcreteVectorDblParamParser =
+ VectorParameterParser<ConcreteVectorDblParam>;
// Declare a concrete type with elements of type bool for testing.
DECLARE_VECTOR_PARAMETER(ConcreteVectorBoolParam, bool)
// Declare a concrete vector parameter parser for testing.
- using ConcreteVectorBoolParamParser = VectorParameterParser<ConcreteVectorBoolParam>;
+ using ConcreteVectorBoolParamParser =
+ VectorParameterParser<ConcreteVectorBoolParam>;
public:
void testParsesParmeterValue1D() {
@@ -95,7 +97,8 @@ public:
void testChainOfResponsibility() {
// Local declare of a successor parser with a successor parameter.
- using ConcreteSuccessorVectorParameterParser = VectorParameterParser<SucessorVectorParameter>;
+ using ConcreteSuccessorVectorParameterParser =
+ VectorParameterParser<SucessorVectorParameter>;
DOMParser pParser;
std::string xmlToParse = "<Parameter><Type>SucessorVectorParameter</"
diff --git a/Framework/Crystal/inc/MantidCrystal/ClusterRegister.h b/Framework/Crystal/inc/MantidCrystal/ClusterRegister.h
index 02b43fa2671bc9e2f1d7925bd39622eebd678b40..8d83e8f41340e8381ec585afacb8dadcafca1790 100644
--- a/Framework/Crystal/inc/MantidCrystal/ClusterRegister.h
+++ b/Framework/Crystal/inc/MantidCrystal/ClusterRegister.h
@@ -40,7 +40,7 @@ class ImplClusterRegister;
class DLLExport ClusterRegister {
public:
/// Cluster map
- using MapCluster = std::map<size_t, boost::shared_ptr<ICluster> >;
+ using MapCluster = std::map<size_t, boost::shared_ptr<ICluster>>;
/// Constructor
ClusterRegister();
diff --git a/Framework/Crystal/inc/MantidCrystal/ConnectedComponentLabeling.h b/Framework/Crystal/inc/MantidCrystal/ConnectedComponentLabeling.h
index 1016d219d97b0233a155bdac4eaee2fdc156debf..6f7c72faba9e2d48c724bb02949e9563acd4646e 100644
--- a/Framework/Crystal/inc/MantidCrystal/ConnectedComponentLabeling.h
+++ b/Framework/Crystal/inc/MantidCrystal/ConnectedComponentLabeling.h
@@ -28,8 +28,10 @@ using PositionToLabelIdMap = std::map<Mantid::Kernel::V3D, size_t>;
using VecIndexes = std::vector<size_t>;
using VecElements = std::vector<DisjointElement>;
using SetIds = std::unordered_set<size_t>;
-using ClusterMap = std::map<size_t, boost::shared_ptr<Mantid::Crystal::ICluster> >;
-using ClusterTuple = boost::tuple<Mantid::API::IMDHistoWorkspace_sptr, ClusterMap>;
+using ClusterMap =
+ std::map<size_t, boost::shared_ptr<Mantid::Crystal::ICluster>>;
+using ClusterTuple =
+ boost::tuple<Mantid::API::IMDHistoWorkspace_sptr, ClusterMap>;
}
class BackgroundStrategy;
diff --git a/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h b/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h
index bcae377a112d68f53e7064ce68c3f484c9e3246d..ca4816edd601a0ced44f11abd08020f1c552fb83 100644
--- a/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h
@@ -46,7 +46,7 @@ public:
private:
/// Typedef for the function to get the variable we're filtering against
- using FilterFunction = std::function<double (const Geometry::IPeak &)>;
+ using FilterFunction = std::function<double(const Geometry::IPeak &)>;
/// Override for algorithm init
void init() override;
diff --git a/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h b/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h
index 45b3862f4841dd2640a30c01d1974a51f59e4ad0..6104fcc75d2fe9e79cfef375cb3b0d228fdcfe46 100644
--- a/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h
+++ b/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h
@@ -54,7 +54,8 @@ private:
void init() override;
void exec() override;
std::vector<std::string> m_specialCoordinatesNames;
- using SpecialCoordinatesNameMap = std::map<std::string, Mantid::Kernel::SpecialCoordinateSystem>;
+ using SpecialCoordinatesNameMap =
+ std::map<std::string, Mantid::Kernel::SpecialCoordinateSystem>;
SpecialCoordinatesNameMap m_specialCoordinatesMap;
static const std::string QLabOption();
static const std::string QSampleOption();
diff --git a/Framework/Crystal/src/ClusterRegister.cpp b/Framework/Crystal/src/ClusterRegister.cpp
index b4a01e25981deeb1985a107fd9281632f6e03fc4..81ffb3b33c924491bef6d55484a6a2041ed1d13c 100644
--- a/Framework/Crystal/src/ClusterRegister.cpp
+++ b/Framework/Crystal/src/ClusterRegister.cpp
@@ -26,7 +26,7 @@ public:
ClusterRegister::MapCluster m_unique;
/// Type for identifying label groups
- using GroupType = std::list<std::unordered_set<size_t> >;
+ using GroupType = std::list<std::unordered_set<size_t>>;
/// Groups of labels to maintain
GroupType m_groups;
diff --git a/Framework/Crystal/src/SaveHKL.cpp b/Framework/Crystal/src/SaveHKL.cpp
index cde781e8e87890b3818902e6bea6974ad3d7919e..42043c5f354587a8bb1855ac6d2010c5273ebd4d 100644
--- a/Framework/Crystal/src/SaveHKL.cpp
+++ b/Framework/Crystal/src/SaveHKL.cpp
@@ -185,7 +185,7 @@ void SaveHKL::exec() {
std::string bankPart = "?";
// We must sort the peaks first by run, then bank #, and save the list of
// workspace indices of it
- using bankMap_t = std::map<int, std::vector<size_t> >;
+ using bankMap_t = std::map<int, std::vector<size_t>>;
using runMap_t = std::map<int, bankMap_t>;
std::set<int> uniqueBanks;
std::set<int> uniqueRuns;
diff --git a/Framework/Crystal/src/SaveIsawPeaks.cpp b/Framework/Crystal/src/SaveIsawPeaks.cpp
index 31118b8ccfe4f4151edf6b8694ecb3effaead5a1..a50badfca018b97d35a92f4b33026209d02d0962 100644
--- a/Framework/Crystal/src/SaveIsawPeaks.cpp
+++ b/Framework/Crystal/src/SaveIsawPeaks.cpp
@@ -62,7 +62,7 @@ void SaveIsawPeaks::exec() {
// We must sort the peaks first by run, then bank #, and save the list of
// workspace indices of it
- using bankMap_t = std::map<int, std::vector<size_t> >;
+ using bankMap_t = std::map<int, std::vector<size_t>>;
using runMap_t = std::map<int, bankMap_t>;
std::set<int, std::less<int>> uniqueBanks;
if (!inst)
diff --git a/Framework/Crystal/test/CentroidPeaksTest.h b/Framework/Crystal/test/CentroidPeaksTest.h
index 625063d288e95bc032136e8cdca1dfb521e06095..9ceedd8f975a4cf69f9e6d8e31a07f04a64ad5db 100644
--- a/Framework/Crystal/test/CentroidPeaksTest.h
+++ b/Framework/Crystal/test/CentroidPeaksTest.h
@@ -56,7 +56,8 @@ public:
rng.seed((unsigned int)(randomSeed));
size_t nd = 1;
// Make a random generator for each dimensions
- using gen_t = boost::variate_generator<boost::mt19937 &, boost::uniform_real<double> >;
+ using gen_t =
+ boost::variate_generator<boost::mt19937 &, boost::uniform_real<double>>;
gen_t *gens[1];
for (size_t d = 0; d < nd; ++d) {
double min = -1.;
diff --git a/Framework/Crystal/test/ClusterIntegrationBaseTest.h b/Framework/Crystal/test/ClusterIntegrationBaseTest.h
index c20f7e367737e55b3161b7698d65a7235f1e374a..56d0fe03679e84f778f9cf847ebf0296094b8b0d 100644
--- a/Framework/Crystal/test/ClusterIntegrationBaseTest.h
+++ b/Framework/Crystal/test/ClusterIntegrationBaseTest.h
@@ -28,9 +28,11 @@ using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
// Helper typedef
-using MDHistoPeaksWSTuple = boost::tuple<IMDHistoWorkspace_sptr, IPeaksWorkspace_sptr>;
+using MDHistoPeaksWSTuple =
+ boost::tuple<IMDHistoWorkspace_sptr, IPeaksWorkspace_sptr>;
// Helper typedef
-using MDEventPeaksWSTuple = boost::tuple<IMDEventWorkspace_sptr, IPeaksWorkspace_sptr>;
+using MDEventPeaksWSTuple =
+ boost::tuple<IMDEventWorkspace_sptr, IPeaksWorkspace_sptr>;
class ClusterIntegrationBaseTest {
protected:
diff --git a/Framework/Crystal/test/IntegratePeaksHybridTest.h b/Framework/Crystal/test/IntegratePeaksHybridTest.h
index fbc9229779d2ea9ec3294bac9bdace37617327b2..97c2a4a92e98da68b93cf5255d36eb0075ca4ae3 100644
--- a/Framework/Crystal/test/IntegratePeaksHybridTest.h
+++ b/Framework/Crystal/test/IntegratePeaksHybridTest.h
@@ -19,7 +19,8 @@ using namespace Mantid::DataObjects;
using namespace Mantid::API;
namespace {
-using AlgorithmOutputs = boost::tuple<WorkspaceGroup_sptr, IPeaksWorkspace_sptr>;
+using AlgorithmOutputs =
+ boost::tuple<WorkspaceGroup_sptr, IPeaksWorkspace_sptr>;
// Execute the clustering integration algorithm
AlgorithmOutputs execute_integration(const MDEventPeaksWSTuple &inputWorkspaces,
diff --git a/Framework/Crystal/test/NormaliseVanadiumTest.h b/Framework/Crystal/test/NormaliseVanadiumTest.h
index 0128e08c3c0543bc7e18bbe5cb8612102dd6e2e1..3c05af399efa1359a4a806586559915e1c725f66 100644
--- a/Framework/Crystal/test/NormaliseVanadiumTest.h
+++ b/Framework/Crystal/test/NormaliseVanadiumTest.h
@@ -52,7 +52,8 @@ EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
rng.seed((unsigned int)(randomSeed));
size_t nd = 1;
// Make a random generator for each dimensions
- using gen_t = boost::variate_generator<boost::mt19937 &, boost::uniform_real<double> >;
+ using gen_t =
+ boost::variate_generator<boost::mt19937 &, boost::uniform_real<double>>;
gen_t *gens[1];
for (size_t d = 0; d < nd; ++d) {
double min = -1.;
diff --git a/Framework/Crystal/test/PeakIntegrationTest.h b/Framework/Crystal/test/PeakIntegrationTest.h
index 75ae43d49fa9876c07444bec0a35428fecea6cde..86a5b3762b96a46a8aaa82e3b9228c3d96dd489c 100644
--- a/Framework/Crystal/test/PeakIntegrationTest.h
+++ b/Framework/Crystal/test/PeakIntegrationTest.h
@@ -59,7 +59,8 @@ public:
rng.seed((unsigned int)(randomSeed));
size_t nd = 1;
// Make a random generator for each dimensions
- using gen_t = boost::variate_generator<boost::mt19937 &, boost::uniform_real<double> >;
+ using gen_t =
+ boost::variate_generator<boost::mt19937 &, boost::uniform_real<double>>;
gen_t *gens[1];
for (size_t d = 0; d < nd; ++d) {
double min = -1.;
diff --git a/Framework/Crystal/test/PeaksInRegionTest.h b/Framework/Crystal/test/PeaksInRegionTest.h
index 5bb6f1af4a61ad4ac79b9951e37fa69d09d3c980..0d15e62e69ae18807d43e293dfafa9ffa5c3e6af 100644
--- a/Framework/Crystal/test/PeaksInRegionTest.h
+++ b/Framework/Crystal/test/PeaksInRegionTest.h
@@ -19,7 +19,8 @@ Functional Tests
class PeaksInRegionTest : public CxxTest::TestSuite {
private:
- using PeakWorkspaceWithExtents = boost::tuple<PeaksWorkspace_sptr, std::vector<double> >;
+ using PeakWorkspaceWithExtents =
+ boost::tuple<PeaksWorkspace_sptr, std::vector<double>>;
/**
Helper function. Creates a peaksworkspace with a single peak
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
index 7e47a5920dae95c49a876d30e16f6e938239a381..52c2db3f26b70e4675111771fbbe7936a27655b2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h
@@ -97,7 +97,7 @@ class MANTID_CURVEFITTING_DLL AugmentedLagrangianOptimizer {
public:
/// Function type
- using ObjFunction = boost::function<double (const size_t, const double *)>;
+ using ObjFunction = boost::function<double(const size_t, const double *)>;
public:
/**
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FortranDefs.h b/Framework/CurveFitting/inc/MantidCurveFitting/FortranDefs.h
index 94c7fdcdc091dc6d839750f03b438c95b4658e9d..dea108cfb57b306c25090010ba6e9f3f55fa7a4f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FortranDefs.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FortranDefs.h
@@ -13,7 +13,7 @@ using ComplexFortranMatrix = FortranMatrix<ComplexMatrix>;
using DoubleFortranMatrix = FortranMatrix<GSLMatrix>;
using ComplexFortranVector = FortranVector<ComplexVector>;
using DoubleFortranVector = FortranVector<GSLVector>;
-using IntFortranVector = FortranVector<std::vector<int> >;
+using IntFortranVector = FortranVector<std::vector<int>>;
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FortranMatrix.h b/Framework/CurveFitting/inc/MantidCurveFitting/FortranMatrix.h
index dc1632592b4b79f523b6c25b55017571b3b97d89..bdbf98db9e0cbdbefddc92f635cf977e234a8310 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FortranMatrix.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FortranMatrix.h
@@ -41,7 +41,8 @@ template <class MatrixClass> class FortranMatrix : public MatrixClass {
int m_base2;
/// Typedef the types returned by the base class's operators []. They aren't
/// necessarily the same as the stored type (double or complex).
- using ElementConstType = decltype(std::declval<const MatrixClass>().operator()(0, 0));
+ using ElementConstType =
+ decltype(std::declval<const MatrixClass>().operator()(0, 0));
using ElementRefType = decltype(std::declval<MatrixClass>().operator()(0, 0));
public:
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
index 3e72fdd3c93f04a8743fa0e155e5261a845fa237..51be2281977e1666d930cbee87c41ec002f5c669 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ChebfunBase.h
@@ -18,7 +18,7 @@ namespace CurveFitting {
namespace Functions {
/// Type of the approximated function
-using ChebfunFunctionType = std::function<double (double)>;
+using ChebfunFunctionType = std::function<double(double)>;
/**
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
index 074f4edff0b4e239810657bdfb9628b2df2b0d01..27766fd6de1a5a0166ea9d7215d948ddee82e0a8 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
@@ -66,7 +66,8 @@ private:
double alph1t) const;
};
-using ThermalNeutronBk2BkExpAlpha_sptr = boost::shared_ptr<ThermalNeutronBk2BkExpAlpha>;
+using ThermalNeutronBk2BkExpAlpha_sptr =
+ boost::shared_ptr<ThermalNeutronBk2BkExpAlpha>;
} // namespace Functions
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
index 42219eb6671232dce0cc5e3c609c3264725c40f7..55c3d3d3fd6e3cf4c551714221c560183cb81fe9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
@@ -66,7 +66,8 @@ private:
double beta1t) const;
};
-using ThermalNeutronBk2BkExpBeta_sptr = boost::shared_ptr<ThermalNeutronBk2BkExpBeta>;
+using ThermalNeutronBk2BkExpBeta_sptr =
+ boost::shared_ptr<ThermalNeutronBk2BkExpBeta>;
} // namespace Functions
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
index f9f8740e0c9e4e9d3056b8bcf2060ce6b2edc0b3..c6cab7ae451a88d1c18ab936d0dac9a7cb7dd95d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
@@ -179,7 +179,8 @@ private:
};
/// Shared pointer to ThermalNeutronBk2BkExpConvPVoigt peak/function
-using ThermalNeutronBk2BkExpConvPVoigt_sptr = boost::shared_ptr<ThermalNeutronBk2BkExpConvPVoigt>;
+using ThermalNeutronBk2BkExpConvPVoigt_sptr =
+ boost::shared_ptr<ThermalNeutronBk2BkExpConvPVoigt>;
//--- Public inline function --------------------------------------------------
/** Calculate d = a/sqrt(h**2+k**2+l**2)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
index 78cf35e042f71b14247ba3ad8c707332a10c5be1..268e33694b48cedbb41ec79c8f886026b5b7fded 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
@@ -65,7 +65,8 @@ private:
double sig2sq) const;
};
-using ThermalNeutronBk2BkExpSigma_sptr = boost::shared_ptr<ThermalNeutronBk2BkExpSigma>;
+using ThermalNeutronBk2BkExpSigma_sptr =
+ boost::shared_ptr<ThermalNeutronBk2BkExpSigma>;
} // namespace Functions
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
index b5c29abea3d06e617a6d4d6177f90bb244d9e0ed..224e293bcc77fad898a6367d54cf39773926d842 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
@@ -81,7 +81,8 @@ private:
// jacobian);
};
-using ThermalNeutronDtoTOFFunction_sptr = boost::shared_ptr<ThermalNeutronDtoTOFFunction>;
+using ThermalNeutronDtoTOFFunction_sptr =
+ boost::shared_ptr<ThermalNeutronDtoTOFFunction>;
/// Calcualte TOF from d-spacing value for thermal neutron
inline double calThermalNeutronTOF(double dh, double dtt1, double dtt1t,
diff --git a/Framework/CurveFitting/src/MSVesuvioHelpers.cpp b/Framework/CurveFitting/src/MSVesuvioHelpers.cpp
index 1180052c9b7237649a8d6c748c335382bbaf7c89..0908408c9115054b549ed872c3670a5afe11bee4 100644
--- a/Framework/CurveFitting/src/MSVesuvioHelpers.cpp
+++ b/Framework/CurveFitting/src/MSVesuvioHelpers.cpp
@@ -358,12 +358,14 @@ RandomNumberGenerator::RandomNumberGenerator(const int seed) : m_generator() {
}
/// Returns a flat random number between 0.0 & 1.0
double RandomNumberGenerator::flat() {
- using uniform_generator = boost::variate_generator<boost::mt19937 &, uniform_double>;
+ using uniform_generator =
+ boost::variate_generator<boost::mt19937 &, uniform_double>;
return uniform_generator(m_generator, uniform_double(0.0, 1.0))();
}
/// Returns a random number distributed by a normal distribution
double RandomNumberGenerator::gaussian(const double mean, const double sigma) {
- using gauss_generator = boost::variate_generator<boost::mt19937 &, gaussian_double>;
+ using gauss_generator =
+ boost::variate_generator<boost::mt19937 &, gaussian_double>;
return gauss_generator(m_generator, gaussian_double(mean, sigma))();
}
diff --git a/Framework/CurveFitting/src/ParameterEstimator.cpp b/Framework/CurveFitting/src/ParameterEstimator.cpp
index e055dd408e1c54af81827d236de9329d20a1d1ef..82b093b48dc646041cdf19c8ad9e8faa8c58a079 100644
--- a/Framework/CurveFitting/src/ParameterEstimator.cpp
+++ b/Framework/CurveFitting/src/ParameterEstimator.cpp
@@ -25,7 +25,7 @@ std::recursive_mutex FUNCTION_MAP_MUTEX;
}
enum Function { None, Gaussian, Lorentzian, BackToBackExponential };
-using FunctionMapType = std::map<std::string, std::pair<size_t, Function> >;
+using FunctionMapType = std::map<std::string, std::pair<size_t, Function>>;
//----------------------------------------------------------------------------------------------
diff --git a/Framework/CurveFitting/test/FortranVectorTest.h b/Framework/CurveFitting/test/FortranVectorTest.h
index bbe3a0a3d2afb1784db245aa37094f4364b751b6..fd4dfb020e9934fbeb3f6ecac4bc100df522dee4 100644
--- a/Framework/CurveFitting/test/FortranVectorTest.h
+++ b/Framework/CurveFitting/test/FortranVectorTest.h
@@ -207,7 +207,7 @@ public:
}
void test_int_array() {
- using FortranIntVector = FortranVector<std::vector<int> >;
+ using FortranIntVector = FortranVector<std::vector<int>>;
FortranIntVector ivec(1, 3);
ivec(1) = 11;
ivec(2) = 22;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
index 7ae07d9601650c81abcafc68a35ee90a4c23426a..9424a2ce8ea3986592b23f30e819395604ecf854 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
@@ -149,7 +149,7 @@ private:
/// used to store the lists of WORKSPACE INDICES that will be grouped, the
/// keys are not used
- using storage_map = std::map<specnum_t, std::vector<size_t> >;
+ using storage_map = std::map<specnum_t, std::vector<size_t>>;
/// An estimate of the percentage of the algorithm runtimes that has been
/// completed
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
index daacd95d40347e9abe88c65af8c4b1ca0a45df05..6ded9e3c0817d78b2294553cfd2dfa97dc7ea79a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
@@ -70,7 +70,8 @@ private:
/// Allowed values for the cache property
std::vector<std::string> m_seperator_options;
std::map<std::string, const char *> m_separatormap; ///<a map of seperators
- using separator_pair = std::pair<std::string, const char *>; ///<serparator pair type def
+ using separator_pair =
+ std::pair<std::string, const char *>; ///<serparator pair type def
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
index bc92388b50867c204c44dc0b13e767422bd28fb7..4fcfdabb54d1379ba803a6d6aaf0fb22c9e1ee97 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
@@ -74,7 +74,8 @@ private:
/// Allowed values for the cache property
std::vector<std::string> m_seperator_options;
std::map<std::string, const char *> m_separatormap; ///<a map of seperators
- using separator_pair = std::pair<std::string, const char *>; ///<serparator pair type def
+ using separator_pair =
+ std::pair<std::string, const char *>; ///<serparator pair type def
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
index fd420e873f7ebe67f2f66893f40c452287376565..5a64490853fc2e559f2f73cb9469638a0db3c21c 100644
--- a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
+++ b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
@@ -288,7 +288,7 @@ void CreateSimulationWorkspace::loadMappingFromISISNXS(
throw std::runtime_error(
"Cannot find path to isis_vms_compat. Is the file an ISIS NeXus file?");
}
- using NXIntArray = boost::scoped_ptr<std::vector<int32_t> >;
+ using NXIntArray = boost::scoped_ptr<std::vector<int32_t>>;
nxsFile.openData("NDET");
NXIntArray ndets(nxsFile.getData<int32_t>());
diff --git a/Framework/DataHandling/src/GroupDetectors2.cpp b/Framework/DataHandling/src/GroupDetectors2.cpp
index 534b5b1b0f67ffe183961325ad63ba707403d922..ffde59f3348e12a00a36edacdf58ceabf5d47814 100644
--- a/Framework/DataHandling/src/GroupDetectors2.cpp
+++ b/Framework/DataHandling/src/GroupDetectors2.cpp
@@ -732,7 +732,7 @@ void GroupDetectors2::processGroupingWorkspace(
std::vector<int64_t> &unUsedSpec) {
detid2index_map detIdToWiMap = workspace->getDetectorIDToWorkspaceIndexMap();
- using Group2SetMapType = std::map<size_t, std::set<size_t> >;
+ using Group2SetMapType = std::map<size_t, std::set<size_t>>;
Group2SetMapType group2WSIndexSetmap;
const auto &spectrumInfo = groupWS->spectrumInfo();
@@ -785,7 +785,7 @@ void GroupDetectors2::processMatrixWorkspace(
std::vector<int64_t> &unUsedSpec) {
detid2index_map detIdToWiMap = workspace->getDetectorIDToWorkspaceIndexMap();
- using Group2SetMapType = std::map<size_t, std::set<size_t> >;
+ using Group2SetMapType = std::map<size_t, std::set<size_t>>;
Group2SetMapType group2WSIndexSetmap;
const auto &spectrumInfo = groupWS->spectrumInfo();
diff --git a/Framework/DataHandling/src/LoadRaw/item_struct.h b/Framework/DataHandling/src/LoadRaw/item_struct.h
index 874bcc3c110331f1fa7f390dd48191cba0789c10..aa5ec35f37fe7e7830cddfb2b3d2ba6828c68690 100644
--- a/Framework/DataHandling/src/LoadRaw/item_struct.h
+++ b/Framework/DataHandling/src/LoadRaw/item_struct.h
@@ -23,8 +23,9 @@ public:
item_struct() : m_items(), m_spec_array(nullptr), m_ndet(0){};
private:
- using items_map_t = std::map<std::string, item_t>; ///<Type def of internal map of named items
- items_map_t m_items; ///<internal map of named items
+ using items_map_t =
+ std::map<std::string, item_t>; ///<Type def of internal map of named items
+ items_map_t m_items; ///<internal map of named items
unsigned long *m_spec_array; ///< length m_ndet; used for averaging values
/// with det_average
long m_ndet; ///<number of detectors
diff --git a/Framework/DataHandling/test/SaveNXSPETest.h b/Framework/DataHandling/test/SaveNXSPETest.h
index 1c7ddb10bf6170e5470f6ff969ed26d3f20d02e0..90b8201c198b1ff07b15611379a661e6c6fd865c 100644
--- a/Framework/DataHandling/test/SaveNXSPETest.h
+++ b/Framework/DataHandling/test/SaveNXSPETest.h
@@ -165,7 +165,9 @@ private:
return inputWS;
}
- using DataHolder = boost::tuple<boost::shared_array<hsize_t>, boost::shared_array<double>, boost::shared_array<double> >;
+ using DataHolder =
+ boost::tuple<boost::shared_array<hsize_t>, boost::shared_array<double>,
+ boost::shared_array<double>>;
DataHolder saveAndReloadWorkspace(const MatrixWorkspace_sptr inputWS) {
SaveNXSPE saver;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffineParser.h b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffineParser.h
index 60d388b828567d382cac770c42d287c050bcefa9..0f8f235fdb275558588a57b9c5356c9bc6f362df 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffineParser.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffineParser.h
@@ -31,7 +31,8 @@ public:
createTransform(Poco::XML::Element *coordTransElement) const;
virtual void setSuccessor(CoordTransformAffineParser *other);
virtual ~CoordTransformAffineParser() = default;
- using SuccessorType_sptr = boost::shared_ptr<CoordTransformAffineParser>; ///< successor parser shared ptr typedef
+ using SuccessorType_sptr = boost::shared_ptr<
+ CoordTransformAffineParser>; ///< successor parser shared ptr typedef
protected:
SuccessorType_sptr m_successor; ///< successor parser
private:
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDBox.h b/Framework/DataObjects/inc/MantidDataObjects/MDBox.h
index bc0b580f2c4c046ee65637ed31b0909ed3e10230..6c3e433311e786144c1f6b47864d111876964dc6 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDBox.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDBox.h
@@ -227,7 +227,7 @@ private:
public:
/// Typedef for a shared pointer to a MDBox
- using sptr = boost::shared_ptr<MDBox<MDE, nd> >;
+ using sptr = boost::shared_ptr<MDBox<MDE, nd>>;
/// Typedef for a vector of the conatined events
using vec_t = std::vector<MDE>;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h b/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
index 1deab64c5080e1ea8a984135f6c7a4614621314b..2617c286f005453e294a3dc2a58d4a9506ad925f 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
@@ -372,7 +372,7 @@ private:
public:
/// Convenience typedef for a shared pointer to a this type of class
- using sptr = boost::shared_ptr<MDBoxBase<MDE, nd> >;
+ using sptr = boost::shared_ptr<MDBoxBase<MDE, nd>>;
}; //(end class MDBoxBase)
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h b/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h
index 6525a5ebc4eb941aa84d5d2e3db35acf8f078751..5c7f31d9ebab2f70d35d917541d19cd84d359e87 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h
@@ -65,14 +65,19 @@ public:
static size_t getMaxNumDim() { return size_t(MAX_MD_DIMENSIONS_NUM); }
private:
- using fpCreateBox = API::IMDNode *(*)(API::BoxController *, const std::vector<Mantid::Geometry::MDDimensionExtents<coord_t> > &, const uint32_t, const size_t, const size_t);
+ using fpCreateBox = API::IMDNode *(*)(
+ API::BoxController *,
+ const std::vector<Mantid::Geometry::MDDimensionExtents<coord_t>> &,
+ const uint32_t, const size_t, const size_t);
// vector of function pointers to the functions which create MDBox or
// MDGridBox;
static std::vector<fpCreateBox> boxCreatorFP;
// typedef for the class function pointer to the function, which creates MD
// Workspaces
- using fpCreateMDWS = API::IMDEventWorkspace *(*)(const std::string &, const Mantid::API::MDNormalization &, const Mantid::API::MDNormalization &);
+ using fpCreateMDWS = API::IMDEventWorkspace *(*)(
+ const std::string &, const Mantid::API::MDNormalization &,
+ const Mantid::API::MDNormalization &);
// vector of function pointers to the funcions
static std::vector<fpCreateMDWS> wsCreatorFP;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
index 3c95e81fc0b97b0dbe05bb78591f237130f44292..d111f289f1d299322263c4c481b17128eb235392 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
@@ -35,7 +35,7 @@ class DLLExport MDEventWorkspace : public API::IMDEventWorkspace {
public:
/// Typedef for a shared pointer of this kind of event workspace
- using sptr = boost::shared_ptr<MDEventWorkspace<MDE, nd> >;
+ using sptr = boost::shared_ptr<MDEventWorkspace<MDE, nd>>;
/// Typedef to access the MDEventType.
using MDEventType = MDE;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h
index 18f6d303ae4372a7428a78b1b752744fb50426ef..5d83894a3a3fb2ca93c40957360fa5600141f33d 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h
@@ -205,7 +205,7 @@ public:
public:
/// Typedef for a shared pointer to a MDGridBox
- using sptr = boost::shared_ptr<MDGridBox<MDE, nd> >;
+ using sptr = boost::shared_ptr<MDGridBox<MDE, nd>>;
/// Typedef for a vector of MDBoxBase pointers
using boxVector_t = std::vector<MDBoxBase<MDE, nd> *>;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h b/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h
index 81aff98e9501f7cc7f76ba06172bc1d1b8dfdb16..622a532b6230fd0710c0e51be0c55aaba40150b3 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h
@@ -15,9 +15,10 @@ namespace DataObjects {
// Typedef for a map for mapping width of neighbours (key) to permutations
// needed in the calcualtion.
-using PermutationsMap = std::map<std::vector<int>, std::vector<int64_t> >;
+using PermutationsMap = std::map<std::vector<int>, std::vector<int64_t>>;
// Typedef for extents
-using MDExtentPair = boost::tuple<Mantid::coord_t, Mantid::coord_t>; // Min/Max pair
+using MDExtentPair =
+ boost::tuple<Mantid::coord_t, Mantid::coord_t>; // Min/Max pair
// Typedef for vector of extents
using VecMDExtents = std::vector<MDExtentPair>;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h
index e016c03afef1063b5509694356b476eafbae08f1..667a43d825a4a12d6bd93c8dc7b0a44c89b9f7a3 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h
@@ -80,7 +80,8 @@ private:
};
using PeakShapeEllipsoid_sptr = boost::shared_ptr<PeakShapeEllipsoid>;
-using PeakShapeEllipsoid_const_sptr = boost::shared_ptr<const PeakShapeEllipsoid>;
+using PeakShapeEllipsoid_const_sptr =
+ boost::shared_ptr<const PeakShapeEllipsoid>;
} // namespace DataObjects
} // namespace Mantid
diff --git a/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h b/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h
index bf1db875535d6a181a105ab2178b057cdf62eaf5..4b19d5910323bca8b712261357f364c963397d2f 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h
@@ -92,7 +92,8 @@ protected:
using SpecialWorkspace2D_sptr = boost::shared_ptr<SpecialWorkspace2D>;
/// shared pointer to a const SpecialWorkspace2D
-using SpecialWorkspace2D_const_sptr = boost::shared_ptr<const SpecialWorkspace2D>;
+using SpecialWorkspace2D_const_sptr =
+ boost::shared_ptr<const SpecialWorkspace2D>;
} // namespace Mantid
} // namespace DataObjects
diff --git a/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h
index f58f040c931f0ed746002cff157cb312dbfece44..2821ec983c542fd6d88f44f24e3fe189f6f66853 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h
@@ -82,7 +82,8 @@ private:
};
using SplittersWorkspace_sptr = boost::shared_ptr<SplittersWorkspace>;
-using SplittersWorkspace_const_sptr = boost::shared_ptr<const SplittersWorkspace>;
+using SplittersWorkspace_const_sptr =
+ boost::shared_ptr<const SplittersWorkspace>;
} // namespace DataObjects
} // namespace Mantid
diff --git a/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h b/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h
index f475a2c29925c16f3122688a8670baf0f484cf4f..b6c071a889d0a978f0c9e83a9304405fe9208d8e 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h
@@ -142,7 +142,9 @@ public:
* @param value :: The value of the element.
*/
template <typename T> double convertToDouble(const T &value) const {
- using DoubleType = typename std::conditional<std::is_convertible<double, T>::value, T, InconvertibleToDoubleType>::type;
+ using DoubleType =
+ typename std::conditional<std::is_convertible<double, T>::value, T,
+ InconvertibleToDoubleType>::type;
return boost::numeric_cast<double, DoubleType>(value);
}
@@ -173,7 +175,9 @@ public:
* @param value: cast this value
*/
void fromDouble(size_t i, double value) override {
- using DoubleType = typename std::conditional<std::is_convertible<double, Type>::value, Type, InconvertibleToDoubleType>::type;
+ using DoubleType =
+ typename std::conditional<std::is_convertible<double, Type>::value,
+ Type, InconvertibleToDoubleType>::type;
m_data[i] =
static_cast<Type>(boost::numeric_cast<DoubleType, double>(value));
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
index 88039b9cdc5bd1628ab6d82d029f05c506695369..7fbc3e0790b56deb064b4b64d24cc31dc9ee1011 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
@@ -410,8 +410,12 @@ private:
}
};
- using column_it = std::vector<boost::shared_ptr<API::Column> >::iterator; ///< Column iterator
- using column_const_it = std::vector<boost::shared_ptr<API::Column> >::const_iterator; ///< Column const iterator
+ using column_it = std::vector<
+ boost::shared_ptr<API::Column>>::iterator; ///< Column iterator
+ using column_const_it =
+ std::vector<boost::shared_ptr<API::Column>>::const_iterator; ///< Column
+ ///const
+ ///iterator
/// Shared pointers to the columns.
std::vector<boost::shared_ptr<API::Column>> m_columns;
/// row count
diff --git a/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h b/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h
index d899d2bdb16acdb4310e12162cdb29444f9bd488..539bcd16ab3549eb23a61d55179958a1556f474d 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h
@@ -97,7 +97,8 @@ private:
/// shared pointer to the WorkspaceSingleValue class
using WorkspaceSingleValue_sptr = boost::shared_ptr<WorkspaceSingleValue>;
-using WorkspaceSingleValue_const_sptr = boost::shared_ptr<const WorkspaceSingleValue>;
+using WorkspaceSingleValue_const_sptr =
+ boost::shared_ptr<const WorkspaceSingleValue>;
} // namespace DataObjects
} // namespace Mantid
diff --git a/Framework/DataObjects/src/CoordTransformAffineParser.cpp b/Framework/DataObjects/src/CoordTransformAffineParser.cpp
index e5d3683ce0652fd0140e767ee547397ca9b3b80e..713e53cf6d294e4f9a69b95158776c7843b8ec2e 100644
--- a/Framework/DataObjects/src/CoordTransformAffineParser.cpp
+++ b/Framework/DataObjects/src/CoordTransformAffineParser.cpp
@@ -20,8 +20,10 @@ Create the transform object.
*/
Mantid::API::CoordTransform *CoordTransformAffineParser::createTransform(
Poco::XML::Element *coordTransElement) const {
- using InDimParameterParser = Mantid::API::SingleValueParameterParser<Mantid::API::InDimParameter>;
- using OutDimParameterParser = Mantid::API::SingleValueParameterParser<Mantid::API::OutDimParameter>;
+ using InDimParameterParser =
+ Mantid::API::SingleValueParameterParser<Mantid::API::InDimParameter>;
+ using OutDimParameterParser =
+ Mantid::API::SingleValueParameterParser<Mantid::API::OutDimParameter>;
using namespace Poco::XML;
if ("CoordTransform" != coordTransElement->localName()) {
std::string message = "This is not a coordinate transform element: " +
diff --git a/Framework/DataObjects/src/CoordTransformDistanceParser.cpp b/Framework/DataObjects/src/CoordTransformDistanceParser.cpp
index 869cd0fc04c63fbe77493180609755032cd8d9b3..d5776a7c5ab975b28b5a6bb5d00d28ff5eb82b26 100644
--- a/Framework/DataObjects/src/CoordTransformDistanceParser.cpp
+++ b/Framework/DataObjects/src/CoordTransformDistanceParser.cpp
@@ -17,10 +17,14 @@ Create the transform object.
Mantid::API::CoordTransform *CoordTransformDistanceParser::createTransform(
Poco::XML::Element *coordTransElement) const {
// Typdef the parameter parsers required.
- using InDimParameterParser = Mantid::API::SingleValueParameterParser<Mantid::API::InDimParameter>;
- using OutDimParameterParser = Mantid::API::SingleValueParameterParser<Mantid::API::OutDimParameter>;
- using CoordCenterParser = Mantid::API::VectorParameterParser<CoordCenterVectorParam>;
- using DimsUsedParser = Mantid::API::VectorParameterParser<DimensionsUsedVectorParam>;
+ using InDimParameterParser =
+ Mantid::API::SingleValueParameterParser<Mantid::API::InDimParameter>;
+ using OutDimParameterParser =
+ Mantid::API::SingleValueParameterParser<Mantid::API::OutDimParameter>;
+ using CoordCenterParser =
+ Mantid::API::VectorParameterParser<CoordCenterVectorParam>;
+ using DimsUsedParser =
+ Mantid::API::VectorParameterParser<DimensionsUsedVectorParam>;
using namespace Poco::XML;
if ("CoordTransform" != coordTransElement->localName()) {
diff --git a/Framework/DataObjects/src/FakeMD.cpp b/Framework/DataObjects/src/FakeMD.cpp
index 8a8d88ce3867b1c675355bcc100a36611bc2d409..873a7a0de06b590d57d080351f87b25e7dc67866 100644
--- a/Framework/DataObjects/src/FakeMD.cpp
+++ b/Framework/DataObjects/src/FakeMD.cpp
@@ -236,7 +236,8 @@ void FakeMD::addFakeRandomData(const std::vector<double> ¶ms,
genUnit(rng, u2);
// Make a random generator for each dimensions
- using gen_t = boost::variate_generator<boost::mt19937 &, boost::uniform_real<double> >;
+ using gen_t =
+ boost::variate_generator<boost::mt19937 &, boost::uniform_real<double>>;
// Inserter to help choose the correct event type
auto eventHelper =
@@ -364,7 +365,8 @@ detid_t FakeMD::pickDetectorID() {
} else {
/// A variate generator to combine a random number generator with a
/// distribution
- using uniform_generator = boost::variate_generator<boost::mt19937 &, boost::uniform_int<size_t> >;
+ using uniform_generator =
+ boost::variate_generator<boost::mt19937 &, boost::uniform_int<size_t>>;
uniform_generator uniformRand(m_randGen, m_uniformDist);
const size_t randIndex = uniformRand();
return m_detIDs[randIndex];
diff --git a/Framework/DataObjects/src/MDBoxFlatTree.cpp b/Framework/DataObjects/src/MDBoxFlatTree.cpp
index aa705020ca0a7dd4e41d8d975c8f666373867ccc..b350f07c9ea0bada433807b280de03dee8997d5e 100644
--- a/Framework/DataObjects/src/MDBoxFlatTree.cpp
+++ b/Framework/DataObjects/src/MDBoxFlatTree.cpp
@@ -8,7 +8,7 @@
#include "MantidKernel/Strings.h"
#include <Poco/File.h>
-using file_holder_type = std::unique_ptr< ::NeXus::File>;
+using file_holder_type = std::unique_ptr<::NeXus::File>;
namespace Mantid {
namespace DataObjects {
diff --git a/Framework/DataObjects/test/MDBoxTest.h b/Framework/DataObjects/test/MDBoxTest.h
index dc7ea136be9a66cac3be9bd205ee2f87117e364b..0f64cf5f143a114f949186afb4f85db5e7d24f3b 100644
--- a/Framework/DataObjects/test/MDBoxTest.h
+++ b/Framework/DataObjects/test/MDBoxTest.h
@@ -372,7 +372,8 @@ public:
void test_bad_splitter() {
BoxController_sptr sc(new BoxController(4));
sc->setSplitThreshold(10);
- using MACROS_ARE_DUMB = MDBox<MDLeanEvent<3>, 3>; //...since they get confused by commas
+ using MACROS_ARE_DUMB =
+ MDBox<MDLeanEvent<3>, 3>; //...since they get confused by commas
TS_ASSERT_THROWS(MACROS_ARE_DUMB b3(sc.get()), std::invalid_argument);
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
index be5ef1c6c67be5a164112baf4ccd2a596391f30f..bc496e93ce61ba6cfe45a41922ac56aefab251ca 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
@@ -85,7 +85,8 @@ private:
BraggScattererFactoryImpl();
};
-using BraggScattererFactory = Mantid::Kernel::SingletonHolder<BraggScattererFactoryImpl>;
+using BraggScattererFactory =
+ Mantid::Kernel::SingletonHolder<BraggScattererFactoryImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
index 5c2a828750334d353e8514c8ebb03beb4ba408ac..584133be8207004eadcc72fc57a35ee0752e7597 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
@@ -72,7 +72,8 @@ protected:
UnitCell m_cell;
};
-using BraggScattererInCrystalStructure_sptr = boost::shared_ptr<BraggScattererInCrystalStructure>;
+using BraggScattererInCrystalStructure_sptr =
+ boost::shared_ptr<BraggScattererInCrystalStructure>;
/**
* Helper class for validating unit cell strings.
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
index d70a80d40b3e341b1e5148b820d6e8b516ddf5a4..3356098ff91b3974b1320caebd70f9379f127450 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
@@ -94,7 +94,8 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<CenteringGroupCreatorImpl>;
};
-using CenteringGroupCreator = Mantid::Kernel::SingletonHolder<CenteringGroupCreatorImpl>;
+using CenteringGroupCreator =
+ Mantid::Kernel::SingletonHolder<CenteringGroupCreatorImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
index aa241526f50a49f22ca957037aeb5643114693cd..a3151c95f1776a1bddbab65488f052b9fe83cd1a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
@@ -10,7 +10,8 @@ namespace Geometry {
class IsotropicAtomBraggScatterer;
-using IsotropicAtomBraggScatterer_sptr = boost::shared_ptr<IsotropicAtomBraggScatterer>;
+using IsotropicAtomBraggScatterer_sptr =
+ boost::shared_ptr<IsotropicAtomBraggScatterer>;
/** @class IsotropicAtomBraggScatterer
@@ -120,7 +121,8 @@ protected:
std::string m_label;
};
-using IsotropicAtomBraggScatterer_sptr = boost::shared_ptr<IsotropicAtomBraggScatterer>;
+using IsotropicAtomBraggScatterer_sptr =
+ boost::shared_ptr<IsotropicAtomBraggScatterer>;
class MANTID_GEOMETRY_DLL IsotropicAtomBraggScattererParser {
public:
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
index 8d2f10ce2f8b4900ca270f40debcb19ce8b24f64..ac135a8df02382fee314882973ebf7aa67d3f4a6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
@@ -31,7 +31,8 @@ public:
};
/// Typedef a factory for type of PeaksTransform.
-using PeakTransformQLabFactory = ConcretePeakTransformFactory<PeakTransformQLab>;
+using PeakTransformQLabFactory =
+ ConcretePeakTransformFactory<PeakTransformQLab>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
index cca344bbfcd65a0f4c6e7865b3483f72ef4aadb9..b2204cf33ff8d8f2bcded40780e9f73ae416629a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
@@ -31,7 +31,8 @@ public:
};
/// Typedef a factory for type of PeaksTransform.
-using PeakTransformQSampleFactory = ConcretePeakTransformFactory<PeakTransformQSample>;
+using PeakTransformQSampleFactory =
+ ConcretePeakTransformFactory<PeakTransformQSample>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
index 659807b5e1abf0eee1651b3dc67900fe007f7eed..1d6e64c7cc89ca6643bd4e52fe6363380b8d1ef2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
@@ -107,7 +107,9 @@ struct MANTID_GEOMETRY_DLL CrystalSystemComparator {
const PointGroup::CrystalSystem &rhs) const;
};
-using PointGroupCrystalSystemMap = std::multimap<PointGroup::CrystalSystem, PointGroup_sptr, CrystalSystemComparator>;
+using PointGroupCrystalSystemMap =
+ std::multimap<PointGroup::CrystalSystem, PointGroup_sptr,
+ CrystalSystemComparator>;
MANTID_GEOMETRY_DLL PointGroupCrystalSystemMap getPointGroupsByCrystalSystem();
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
index 36fcf28c04ba270d43cbef4cfda20919360ccc7b..51f76496811c654433201a3d19e437208bb7cf0a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
@@ -120,7 +120,8 @@ private:
boost::regex m_originChoiceRegex;
};
-using PointGroupFactory = Mantid::Kernel::SingletonHolder<PointGroupFactoryImpl>;
+using PointGroupFactory =
+ Mantid::Kernel::SingletonHolder<PointGroupFactoryImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
index 967f4dd95d3afc34bbed8b0f6750adff4233b5d8..536711ebbc5504855b4760a1834c2887238779cf 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
@@ -61,7 +61,8 @@ private:
SpaceGroup_const_sptr m_prototype;
};
-using AbstractSpaceGroupGenerator_sptr = boost::shared_ptr<AbstractSpaceGroupGenerator>;
+using AbstractSpaceGroupGenerator_sptr =
+ boost::shared_ptr<AbstractSpaceGroupGenerator>;
/// Concrete space group generator that uses space group generators as given in
/// ITA.
@@ -264,7 +265,8 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<SpaceGroupFactoryImpl>;
};
-using SpaceGroupFactory = Mantid::Kernel::SingletonHolder<SpaceGroupFactoryImpl>;
+using SpaceGroupFactory =
+ Mantid::Kernel::SingletonHolder<SpaceGroupFactoryImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h
index d11c333c45e81cde13cae1a778bdaf3b9e2a5db4..ca7da50362efaf35e00fa0931fd5e40483424fe3 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h
@@ -59,7 +59,8 @@ protected:
crystalStructureSetHook(const CrystalStructure &crystalStructure);
};
-using StructureFactorCalculator_sptr = boost::shared_ptr<StructureFactorCalculator>;
+using StructureFactorCalculator_sptr =
+ boost::shared_ptr<StructureFactorCalculator>;
namespace StructureFactorCalculatorFactory {
/// Small templated factory function that creates the desired calculator
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
index ea21a3a3fe46b6d06a44d1dfa51d0c471271e471..890695c8f852e5e2d5742624466c9caad3b3110e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
@@ -54,7 +54,8 @@ protected:
CompositeBraggScatterer_sptr m_unitCellScatterers;
};
-using StructureFactorSummation_sptr = boost::shared_ptr<StructureFactorCalculatorSummation>;
+using StructureFactorSummation_sptr =
+ boost::shared_ptr<StructureFactorCalculatorSummation>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
index fcbb80c04317fcae8b237abe8bcd999a7494e944..1786880dff5fa64e11ec2de89f565d5f733f3f68 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
@@ -100,7 +100,8 @@ protected:
V3R m_inversionPoint;
};
-using SymmetryElementInversion_sptr = boost::shared_ptr<SymmetryElementInversion>;
+using SymmetryElementInversion_sptr =
+ boost::shared_ptr<SymmetryElementInversion>;
/** @class SymmetryElementTranslation
@@ -121,7 +122,8 @@ protected:
V3R m_translation;
};
-using SymmetryElementTranslation_sptr = boost::shared_ptr<SymmetryElementTranslation>;
+using SymmetryElementTranslation_sptr =
+ boost::shared_ptr<SymmetryElementTranslation>;
/** @class SymmetryElementWithAxis
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
index 5d764b1ee2e966fa59ebc2ff6d7cc264cd8c8baf..5da8c6f963ba61599968d376365dd84e54ed3d0c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
@@ -41,7 +41,8 @@ public:
virtual bool canProcess(const SymmetryOperation &operation) const = 0;
};
-using AbstractSymmetryElementGenerator_sptr = boost::shared_ptr<AbstractSymmetryElementGenerator>;
+using AbstractSymmetryElementGenerator_sptr =
+ boost::shared_ptr<AbstractSymmetryElementGenerator>;
/** @class SymmetryElementIdentityGenerator
@@ -257,7 +258,8 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<SymmetryElementFactoryImpl>;
};
-using SymmetryElementFactory = Mantid::Kernel::SingletonHolder<SymmetryElementFactoryImpl>;
+using SymmetryElementFactory =
+ Mantid::Kernel::SingletonHolder<SymmetryElementFactoryImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
index ce5f4451ac5fd1e752ea9655b36102bbcadddbad..03b1d78c0d163472561d654733da789fff10d396 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
@@ -78,7 +78,8 @@ private:
SymmetryOperationFactoryImpl();
};
-using SymmetryOperationFactory = Mantid::Kernel::SingletonHolder<SymmetryOperationFactoryImpl>;
+using SymmetryOperationFactory =
+ Mantid::Kernel::SingletonHolder<SymmetryOperationFactoryImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/IDetector.h b/Framework/Geometry/inc/MantidGeometry/IDetector.h
index 9aa29c982526295ba0aa75cb24cad0b992ecd2fc..1ad29b9e9598cb76f9003dfb1785a36854109f14 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDetector.h
@@ -117,7 +117,8 @@ public:
/// Shared pointer to IDetector
using IDetector_sptr = boost::shared_ptr<Mantid::Geometry::IDetector>;
/// Shared pointer to IDetector (const version)
-using IDetector_const_sptr = boost::shared_ptr<const Mantid::Geometry::IDetector>;
+using IDetector_const_sptr =
+ boost::shared_ptr<const Mantid::Geometry::IDetector>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Framework/Geometry/inc/MantidGeometry/Instrument.h
index c786b5abec2950a5d9ffce06cf526e6086df6aec..53d40e5079c7b859128f9cbb621b35fa86b2a1a0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument.h
@@ -26,7 +26,9 @@ class XMLInstrumentParameter;
class ParameterMap;
class ReferenceFrame;
/// Convenience typedef
-using InstrumentParameterCache = std::map<std::pair<std::string, const IComponent *>, boost::shared_ptr<XMLInstrumentParameter> >;
+using InstrumentParameterCache =
+ std::map<std::pair<std::string, const IComponent *>,
+ boost::shared_ptr<XMLInstrumentParameter>>;
/**
Base Instrument Class.
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h b/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
index cfeb0f6342a785c0e7d72299c04380170f891b6e..2102997d767235544c750468ea45e82183f55f75 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
@@ -48,7 +48,8 @@ class MANTID_GEOMETRY_DLL CompAssembly : public ICompAssembly,
public Component {
protected:
using comp_it = std::vector<IComponent *>::iterator; ///< Iterator type
- using const_comp_it = std::vector<IComponent *>::const_iterator; ///< Const iterator type
+ using const_comp_it =
+ std::vector<IComponent *>::const_iterator; ///< Const iterator type
public:
/// String description of the type of component
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
index c301aca85d8b979434b32dbdc0dc85ede1a263ec..aaf251206b4e73faaf74a62fb664c1cb225b8682 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
@@ -46,7 +46,8 @@ namespace Geometry {
class MANTID_GEOMETRY_DLL ObjCompAssembly : public virtual ICompAssembly,
public virtual ObjComponent {
using comp_it = std::vector<ObjComponent *>::iterator; ///< Iterator type
- using const_comp_it = std::vector<ObjComponent *>::const_iterator; ///< Const iterator type
+ using const_comp_it =
+ std::vector<ObjComponent *>::const_iterator; ///< Const iterator type
public:
/// String description of the type of component
std::string type() const override { return "ObjCompAssembly"; }
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
index 12385412020d4009fc9e45214f4eac6e5e0a84c8..c6fa3fc9bb47a16558b86ae24e2e81e7b18339c1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
@@ -68,7 +68,7 @@ private:
/// A typedef for the instantiator
using AbstractFactory = Kernel::AbstractInstantiator<Parameter>;
- using FactoryMap = std::map<std::string, std::unique_ptr<AbstractFactory> >;
+ using FactoryMap = std::map<std::string, std::unique_ptr<AbstractFactory>>;
/// The map holding the registered class names and their instantiators
static FactoryMap s_map;
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
index 4d2120d4c5bf586c9399ff296b15b679b0c5075b..2002187149a50f1250c66fce5ce1f38204cc5711 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
@@ -54,17 +54,23 @@ class Instrument;
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
/// Parameter map iterator typedef
-using component_map_it = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >::iterator;
-using component_map_cit = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >::const_iterator;
+using component_map_it =
+ tbb::concurrent_unordered_multimap<ComponentID,
+ boost::shared_ptr<Parameter>>::iterator;
+using component_map_cit = tbb::concurrent_unordered_multimap<
+ ComponentID, boost::shared_ptr<Parameter>>::const_iterator;
class MANTID_GEOMETRY_DLL ParameterMap {
public:
/// Parameter map typedef
- using pmap = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >;
+ using pmap = tbb::concurrent_unordered_multimap<ComponentID,
+ boost::shared_ptr<Parameter>>;
/// Parameter map iterator typedef
- using pmap_it = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >::iterator;
+ using pmap_it = tbb::concurrent_unordered_multimap<
+ ComponentID, boost::shared_ptr<Parameter>>::iterator;
/// Parameter map iterator typedef
- using pmap_cit = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >::const_iterator;
+ using pmap_cit = tbb::concurrent_unordered_multimap<
+ ComponentID, boost::shared_ptr<Parameter>>::const_iterator;
/// Default constructor
ParameterMap();
/// Const constructor
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
index 5033068f3ac0a55c0d9ab5030d6f0a899d52ca2c..d7b11738945df39b007e1a8726262229cc6c8e41 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
@@ -212,7 +212,8 @@ MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &,
const RectangularDetector &);
using RectangularDetector_sptr = boost::shared_ptr<RectangularDetector>;
-using RectangularDetector_const_sptr = boost::shared_ptr<const RectangularDetector>;
+using RectangularDetector_const_sptr =
+ boost::shared_ptr<const RectangularDetector>;
} // Namespace Geometry
} // Namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
index ce1b5f4fad19764d535708d933c69309c34b4f1e..fdfb8b637d1522bc0615bdcb29366612d0760dda 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
@@ -193,7 +193,8 @@ MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &,
const StructuredDetector &);
using StructuredDetector_sptr = boost::shared_ptr<StructuredDetector>;
-using StructuredDetector_const_sptr = boost::shared_ptr<const StructuredDetector>;
+using StructuredDetector_const_sptr =
+ boost::shared_ptr<const StructuredDetector>;
} // namespace Geometry
} // namespace Mantid
#endif // STRUCTUREDDETECTOR_H
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
index 1c0c7a16cdc451d7f92d543a8c0a281730060586..20cae05ac533537add554521c15872db101210f9 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
@@ -63,7 +63,8 @@ public:
protected:
std::vector<Mantid::Geometry::MDImplicitFunction_sptr> m_Functions;
- using FunctionIterator = std::vector<Mantid::Geometry::MDImplicitFunction_sptr>::const_iterator;
+ using FunctionIterator =
+ std::vector<Mantid::Geometry::MDImplicitFunction_sptr>::const_iterator;
};
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
index 87a1023e55c06e384bf0cb3c2f985c4ddb4ed5ef..a017602c9869beaf9e8b2ac418da68d96f7a7af2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
@@ -42,7 +42,12 @@ class MANTID_GEOMETRY_DLL SurfaceFactory {
private:
// workaround because gcc 4.4 cannot have std::unique_ptr inside a std::map.
// http://stackoverflow.com/questions/7342703/gcc-4-4-4-5-unique-ptr-not-work-for-unordered-set-unordered-map
- using MapType = std::vector<std::pair<std::string, std::unique_ptr<Surface> > >; ///< Storage of surface pointers
+ using MapType =
+ std::vector<std::pair<std::string, std::unique_ptr<Surface>>>; ///<
+ ///Storage
+ ///of
+ ///surface
+ ///pointers
static SurfaceFactory *FOBJ; ///< Effective "this"
MapType SGrid; ///< The tally stack
diff --git a/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp b/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp
index 6378c827da7e3db8706284e37390850d22e9e905..82278e59f50d1cd2d556862aaffc4117df76b434 100644
--- a/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp
+++ b/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp
@@ -117,7 +117,8 @@ double XMLInstrumentParameter::createParamValue(
if (!m_logfileID.empty()) {
// get value from time series
- using StatisticsMapType = std::map<std::string, Kernel::Math::StatisticType>;
+ using StatisticsMapType =
+ std::map<std::string, Kernel::Math::StatisticType>;
StatisticsMapType statistics_types;
statistics_types.emplace("first_value", Kernel::Math::FirstValue);
statistics_types.emplace("last_value", Kernel::Math::LastValue);
diff --git a/Framework/Geometry/test/CSGObjectTest.h b/Framework/Geometry/test/CSGObjectTest.h
index e9b79fdd159b52b567b3e325b08269578792a3bb..0557002c49cac56d3c88f0fe7fe849de3eabada1 100644
--- a/Framework/Geometry/test/CSGObjectTest.h
+++ b/Framework/Geometry/test/CSGObjectTest.h
@@ -1147,7 +1147,7 @@ public:
private:
/// Surface type
- using STYPE = std::map<int, boost::shared_ptr<Surface> >;
+ using STYPE = std::map<int, boost::shared_ptr<Surface>>;
/// set timeTest true to get time comparisons of soild angle methods
const static bool timeTest = false;
diff --git a/Framework/Geometry/test/ParameterMapTest.h b/Framework/Geometry/test/ParameterMapTest.h
index f9c03f4d78a83662314529e9c9e37be2b66733b3..bfa297487d907f86a2a9b9537ce297967cdc4084 100644
--- a/Framework/Geometry/test/ParameterMapTest.h
+++ b/Framework/Geometry/test/ParameterMapTest.h
@@ -304,7 +304,9 @@ public:
test_Replacing_Existing_Parameter_On_A_Copy_Does_Not_Update_Original_Value_Using_AddHelpers_As_Strings() {
// -- Specialized Helper Functions --
- using AddFuncHelper = boost::function<void (ParameterMap *, const IComponent *, const std::string &, const std::string &, const std::string *const)>;
+ using AddFuncHelper = boost::function<void(
+ ParameterMap *, const IComponent *, const std::string &,
+ const std::string &, const std::string *const)>;
// double
AddFuncHelper faddDouble;
diff --git a/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h b/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
index 64e7e0721accb3584463084ddf239691674a9914..4147d2a9e1faa31293bfc1958a1ad55c9c983538 100644
--- a/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
+++ b/Framework/ICat/inc/MantidICat/GSoap/stdsoap2.h
@@ -2430,7 +2430,8 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_rand(void);
#endif
/* soap_traverse() traversal/walker routines take walker function arguments */
-using soap_walker = void (struct soap *, void *, int, const char *, const char *);
+using soap_walker = void(struct soap *, void *, int, const char *,
+ const char *);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap *soap);
diff --git a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
index 66646cfd0a6c89f2f4252a3663e090f2424c6415..dff6a293d751f09a768ce060ca92d8833404bc7a 100644
--- a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
+++ b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
@@ -766,8 +766,8 @@ const int ANN_N_SHRINK_RULES = 4; // number of shrink rules
// Some types and objects used by kd-tree functions
// See src/kd_tree.h and src/kd_tree.cpp for definitions
//----------------------------------------------------------------------
-class ANNkdStats; // stats on kd-tree
-class ANNkd_node; // generic node in a kd-tree
+class ANNkdStats; // stats on kd-tree
+class ANNkd_node; // generic node in a kd-tree
using ANNkd_ptr = ANNkd_node *; // pointer to a kd-tree node
class DLL_API ANNkd_tree : public ANNpointSet {
diff --git a/Framework/Kernel/inc/MantidKernel/Cache.h b/Framework/Kernel/inc/MantidKernel/Cache.h
index f8ff898e1161a6d667e0d2901b69dc911e5ec5d7..eb6167cad323f8292ddfc9dfcd9dd5370c34b188 100644
--- a/Framework/Kernel/inc/MantidKernel/Cache.h
+++ b/Framework/Kernel/inc/MantidKernel/Cache.h
@@ -169,7 +169,8 @@ private:
/// iterator typedef
using CacheMapIterator = typename std::map<KEYTYPE, VALUETYPE>::iterator;
/// const_iterator typedef
- using CacheMapConstIterator = typename std::map<KEYTYPE, VALUETYPE>::const_iterator;
+ using CacheMapConstIterator =
+ typename std::map<KEYTYPE, VALUETYPE>::const_iterator;
};
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index 0b9f4daa61e4d7d031fcc3dcf27c06fec0190447..1da60b745ee0b73714a2a5b8933d7f58bca17ded 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -359,8 +359,10 @@ EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<ConfigServiceImpl>;
using ConfigService = Mantid::Kernel::SingletonHolder<ConfigServiceImpl>;
-using ConfigValChangeNotification = Mantid::Kernel::ConfigServiceImpl::ValueChanged;
-using ConfigValChangeNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::ConfigServiceImpl::ValueChanged> &;
+using ConfigValChangeNotification =
+ Mantid::Kernel::ConfigServiceImpl::ValueChanged;
+using ConfigValChangeNotification_ptr =
+ const Poco::AutoPtr<Mantid::Kernel::ConfigServiceImpl::ValueChanged> &;
} // namespace Kernel
} // namespace Mantid
diff --git a/Framework/Kernel/inc/MantidKernel/DataService.h b/Framework/Kernel/inc/MantidKernel/DataService.h
index 12a78532ade309182667d50553ce01abcddc8537..788d75a803fabea8d3e68182514e1d01f8c42f09 100644
--- a/Framework/Kernel/inc/MantidKernel/DataService.h
+++ b/Framework/Kernel/inc/MantidKernel/DataService.h
@@ -75,7 +75,8 @@ struct CaseInsensitiveCmp {
template <typename T> class DLLExport DataService {
private:
/// Typedef for the map holding the names of and pointers to the data objects
- using svcmap = std::map<std::string, boost::shared_ptr<T>, CaseInsensitiveCmp>;
+ using svcmap =
+ std::map<std::string, boost::shared_ptr<T>, CaseInsensitiveCmp>;
/// Iterator for the data store map
using svc_it = typename svcmap::iterator;
/// Const iterator for the data store map
diff --git a/Framework/Kernel/inc/MantidKernel/DiskBuffer.h b/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
index 5806a3deb46ba67122534decdb14135e11e481e2..9322b0a94e0bed1d25b280d652199a329194cc99 100644
--- a/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
+++ b/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
@@ -61,7 +61,14 @@ public:
* Index 1: Position in the file.
* Index 2: Size of the free block
*/
- using freeSpace_t = boost::multi_index::multi_index_container<FreeBlock, boost::multi_index::indexed_by<boost::multi_index::ordered_non_unique< ::boost::multi_index::const_mem_fun<FreeBlock, uint64_t, &FreeBlock::getFilePosition> >, boost::multi_index::ordered_non_unique< ::boost::multi_index::const_mem_fun<FreeBlock, uint64_t, &FreeBlock::getSize> > > >;
+ using freeSpace_t = boost::multi_index::multi_index_container<
+ FreeBlock, boost::multi_index::indexed_by<
+ boost::multi_index::ordered_non_unique<
+ ::boost::multi_index::const_mem_fun<
+ FreeBlock, uint64_t, &FreeBlock::getFilePosition>>,
+ boost::multi_index::ordered_non_unique<
+ ::boost::multi_index::const_mem_fun<
+ FreeBlock, uint64_t, &FreeBlock::getSize>>>>;
/// A way to index the free space by their size
using freeSpace_bySize_t = freeSpace_t::nth_index<1>::type;
diff --git a/Framework/Kernel/inc/MantidKernel/FacilityInfo.h b/Framework/Kernel/inc/MantidKernel/FacilityInfo.h
index 05f1a335f0a2eda61aedab2f0264c3226d190231..a1af17b73ffdf1e1d46f9216b83ec58abef0acd8 100644
--- a/Framework/Kernel/inc/MantidKernel/FacilityInfo.h
+++ b/Framework/Kernel/inc/MantidKernel/FacilityInfo.h
@@ -131,7 +131,8 @@ private:
/// this facility
// TODO: remove RemoteJobManager form here (trac ticket #11373)
- using ComputeResourcesMap = std::map<std::string, boost::shared_ptr<RemoteJobManager> >;
+ using ComputeResourcesMap =
+ std::map<std::string, boost::shared_ptr<RemoteJobManager>>;
ComputeResourcesMap m_computeResources; ///< list of compute resources
///(clusters, etc...) available at
/// this facility
diff --git a/Framework/Kernel/inc/MantidKernel/InstrumentInfo.h b/Framework/Kernel/inc/MantidKernel/InstrumentInfo.h
index 924739756217fbec8c8d423703237cd2a36a6b86..67f12f60fc93aef099448a60b9bc7e15da04c2e6 100644
--- a/Framework/Kernel/inc/MantidKernel/InstrumentInfo.h
+++ b/Framework/Kernel/inc/MantidKernel/InstrumentInfo.h
@@ -90,7 +90,7 @@ private:
/// Typedef for the zeropadding holder, first is starting run-number,
/// second is file prefix - zero padding pair
- using ZeroPaddingMap = std::map<unsigned int, std::pair<std::string, int> >;
+ using ZeroPaddingMap = std::map<unsigned int, std::pair<std::string, int>>;
/// get the zeropadding part
int getZeroPadding(ZeroPaddingMap::const_iterator it) const {
return it->second.second;
diff --git a/Framework/Kernel/inc/MantidKernel/MRUList.h b/Framework/Kernel/inc/MantidKernel/MRUList.h
index 59d3dadfee05a6855a38a43b17064661b0baadcc..33a8dcee1b7bfc12d95c896f0a2c08e29200caab 100644
--- a/Framework/Kernel/inc/MantidKernel/MRUList.h
+++ b/Framework/Kernel/inc/MantidKernel/MRUList.h
@@ -48,10 +48,16 @@ namespace Kernel {
template <class T> class DLLExport MRUList {
private:
/// hideous typedef for the container holding the list
- using item_list = typename boost::multi_index::multi_index_container<T *, boost::multi_index::indexed_by<boost::multi_index::sequenced<>, boost::multi_index::hashed_unique< ::boost::multi_index::const_mem_fun<T, std::uintptr_t, &T::hashIndexFunction> > > >;
+ using item_list = typename boost::multi_index::multi_index_container<
+ T *,
+ boost::multi_index::indexed_by<
+ boost::multi_index::sequenced<>,
+ boost::multi_index::hashed_unique<::boost::multi_index::const_mem_fun<
+ T, std::uintptr_t, &T::hashIndexFunction>>>>;
/// This typedef makes an ordered item list (you access it by the 1st index)
- using ordered_item_list = typename boost::multi_index::nth_index<item_list, 1>::type;
+ using ordered_item_list =
+ typename boost::multi_index::nth_index<item_list, 1>::type;
/// The most recently used list
mutable item_list il;
diff --git a/Framework/Kernel/inc/MantidKernel/NearestNeighbours.h b/Framework/Kernel/inc/MantidKernel/NearestNeighbours.h
index 2ab3136171132bac3e53ec692609f0d1fc5f9449..e8fa5ef6424ea1dbaab056d0bb356f47653206a9 100644
--- a/Framework/Kernel/inc/MantidKernel/NearestNeighbours.h
+++ b/Framework/Kernel/inc/MantidKernel/NearestNeighbours.h
@@ -104,7 +104,8 @@ template <int N = 3> class DLLExport NearestNeighbours {
public:
// typedefs for code brevity
using VectorType = Eigen::Matrix<double, N, 1>;
- using NearestNeighbourResults = std::vector<std::tuple<VectorType, size_t, double> >;
+ using NearestNeighbourResults =
+ std::vector<std::tuple<VectorType, size_t, double>>;
/** Create a nearest neighbour search object
*
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManager.h b/Framework/Kernel/inc/MantidKernel/PropertyManager.h
index 40d847287ed55f1d844cb312e21cecbbf858ac96..e9b4e33ab162f5b76750d10d78658f397e092f9c 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManager.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManager.h
@@ -135,7 +135,7 @@ private:
const std::unordered_set<std::string> &ignoreProperties);
/// typedef for the map holding the properties
- using PropertyMap = std::map<std::string, std::unique_ptr<Property> >;
+ using PropertyMap = std::map<std::string, std::unique_ptr<Property>>;
/// The properties under management
PropertyMap m_properties;
/// Stores the order in which the properties were declared.
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
index 5a3493f1efdc7a6fd31b4c23814e5fdad1e390b8..2a64ff336c201d409c37a6a1da37709299b3c280 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
@@ -53,7 +53,8 @@ private:
EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
-using PropertyManagerDataService = Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
+using PropertyManagerDataService =
+ Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
} // Namespace Kernel
} // Namespace Mantid
diff --git a/Framework/Kernel/inc/MantidKernel/Unit.h b/Framework/Kernel/inc/MantidKernel/Unit.h
index 3cbb16907fb840efa8e8ee81cf149b4c1e123160..26374a5194af1766743e2afae3e9d9fd3232eaaf 100644
--- a/Framework/Kernel/inc/MantidKernel/Unit.h
+++ b/Framework/Kernel/inc/MantidKernel/Unit.h
@@ -229,10 +229,12 @@ private:
using ConstantAndPower = std::pair<double, double>;
/// Lists, for a given starting unit, the units to which a 'quick conversion'
/// can be made
- using UnitConversions = tbb::concurrent_unordered_map<std::string, ConstantAndPower>;
+ using UnitConversions =
+ tbb::concurrent_unordered_map<std::string, ConstantAndPower>;
/// The possible 'quick conversions' are held in a map with the starting unit
/// as the key
- using ConversionsMap = tbb::concurrent_unordered_map<std::string, UnitConversions>;
+ using ConversionsMap =
+ tbb::concurrent_unordered_map<std::string, UnitConversions>;
/// The table of possible 'quick conversions'
static ConversionsMap s_conversionFactors;
};
diff --git a/Framework/Kernel/src/ANN/kd_tree.h b/Framework/Kernel/src/ANN/kd_tree.h
index 01d9e464154f789a2c5b1f40d1c06d2d69c3af22..e47a54f1574b186d2024f1d73ee2ebcbc16e2a2f 100644
--- a/Framework/Kernel/src/ANN/kd_tree.h
+++ b/Framework/Kernel/src/ANN/kd_tree.h
@@ -70,7 +70,9 @@ public:
// for building the tree.
//----------------------------------------------------------------------
-using ANNkd_splitter = void (*)(ANNpointArray, ANNidxArray, const ANNorthRect &, int, int, int &, ANNcoord &, int &); // num of points on low side (returned)
+using ANNkd_splitter = void (*)(ANNpointArray, ANNidxArray, const ANNorthRect &,
+ int, int, int &, ANNcoord &,
+ int &); // num of points on low side (returned)
//----------------------------------------------------------------------
// Leaf kd-tree node
diff --git a/Framework/Kernel/src/ANN/pr_queue.h b/Framework/Kernel/src/ANN/pr_queue.h
index ff6d7db8a636d1c101f46d8ebcd4793f9c77c175..ca53d2ee82b31dc6f4aff12a04f30d144c9885de 100644
--- a/Framework/Kernel/src/ANN/pr_queue.h
+++ b/Framework/Kernel/src/ANN/pr_queue.h
@@ -32,7 +32,7 @@
//----------------------------------------------------------------------
// Basic types.
//----------------------------------------------------------------------
-using PQinfo = void *; // info field is generic pointer
+using PQinfo = void *; // info field is generic pointer
using PQkey = ANNdist; // key field is distance
//----------------------------------------------------------------------
diff --git a/Framework/Kernel/src/MaterialXMLParser.cpp b/Framework/Kernel/src/MaterialXMLParser.cpp
index e376188d2ef293b4db10ada03d1286d8d24d6ca8..f1411168f7cceb81b047ab567b6674b5563ab96f 100644
--- a/Framework/Kernel/src/MaterialXMLParser.cpp
+++ b/Framework/Kernel/src/MaterialXMLParser.cpp
@@ -65,7 +65,8 @@ using BuilderMethod = MaterialBuilder &(MaterialBuilder::*)(ArgType);
template <typename ArgType>
struct TypedBuilderHandle final : public BuilderHandle {
// Remove const/reference qualifiers from ArgType
- using ValueType = typename std::remove_const<typename std::remove_reference<ArgType>::type>::type;
+ using ValueType = typename std::remove_const<
+ typename std::remove_reference<ArgType>::type>::type;
explicit TypedBuilderHandle(BuilderMethod<ArgType> m)
: BuilderHandle(), m_method(m) {}
diff --git a/Framework/Kernel/test/MultiFileNameParserTest.h b/Framework/Kernel/test/MultiFileNameParserTest.h
index 85eb85dead2bb69e42ff358c9f212f9d1f2200ae..d5754a82f95fdaaa0cde3c75068133f213b447f2 100644
--- a/Framework/Kernel/test/MultiFileNameParserTest.h
+++ b/Framework/Kernel/test/MultiFileNameParserTest.h
@@ -19,7 +19,7 @@ public:
}
static void destroySuite(MultiFileNameParserTest *suite) { delete suite; }
- using ParsedRuns = std::vector<std::vector<unsigned int> >;
+ using ParsedRuns = std::vector<std::vector<unsigned int>>;
/////////////////////////////////////////////////////////////////////////////
// Testing of parseMultiRunString.
diff --git a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
index ae59b224e1c9ccae98cb3549fbef2f052251ec96..7b76f388e850c9ed4f3db4d6de75eaecfbccef94 100644
--- a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
@@ -180,7 +180,8 @@ private:
// maps <device id, variable id> to variable name
// (variable names are unique, so we don't need to worry about device names.)
- using NameMapType = std::map<std::pair<unsigned int, unsigned int>, std::string>;
+ using NameMapType =
+ std::map<std::pair<unsigned int, unsigned int>, std::string>;
NameMapType m_nameMap;
// ---------------------------------------------------------------------------
@@ -195,7 +196,8 @@ private:
// Maps the device ID / variable ID pair to the actual packet. Using a map
// means we will only keep one packet (the most recent one) for each variable
- using VariableMapType = std::map<std::pair<unsigned int, unsigned int>, boost::shared_ptr<ADARA::Packet> >;
+ using VariableMapType = std::map<std::pair<unsigned int, unsigned int>,
+ boost::shared_ptr<ADARA::Packet>>;
VariableMapType m_variableMap;
// Process all the variable value packets stored in m_variableMap
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
index 2e582a03d626cbe9edb1e3896b7e3b243cf5761d..271c61fca3b24e3ff6a3480a0b94f609179ac9be 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
@@ -67,7 +67,9 @@ struct IntegrationParameters {
<http://doxygen.mantidproject.org>
*/
-using EventListMap = std::unordered_map<int64_t, std::vector<std::pair<double, Mantid::Kernel::V3D> > >;
+using EventListMap =
+ std::unordered_map<int64_t,
+ std::vector<std::pair<double, Mantid::Kernel::V3D>>>;
using PeakQMap = std::unordered_map<int64_t, Mantid::Kernel::V3D>;
class DLLExport Integrate3DEvents {
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW2.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW2.h
index 2952d8e2b55eb9b9696028a97a01d2f457b2bd98..c770267191d96ed67ae39e479aed64d98e58fb42 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW2.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW2.h
@@ -53,7 +53,8 @@ public:
private:
/// Local typedef for
- using SQWWorkspace = DataObjects::MDEventWorkspace<DataObjects::MDEvent<4>, 4>;
+ using SQWWorkspace =
+ DataObjects::MDEventWorkspace<DataObjects::MDEvent<4>, 4>;
void init() override;
void exec() override;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDEventWSWrapper.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDEventWSWrapper.h
index ada40278317ed1c4496f346709bf9ec9a136387c..aed554526a034fa674936bc52577a2a3ab78857f 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDEventWSWrapper.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDEventWSWrapper.h
@@ -50,7 +50,8 @@ class MDEventWSWrapper;
using fpVoidMethod = void (MDEventWSWrapper::*)();
/// signature for the internal templated function pointer to add data to an
/// existing workspace
-using fpAddData = void (MDEventWSWrapper::*)(float *, uint16_t *, uint32_t *, coord_t *, size_t) const;
+using fpAddData = void (MDEventWSWrapper::*)(float *, uint16_t *, uint32_t *,
+ coord_t *, size_t) const;
/// signature for the internal templated function pointer to create workspace
using fpCreateWS = void (MDEventWSWrapper::*)(const MDWSDescription &);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
index a857f1102d3ff8ae8cfe8b8eaa11d5f1bcc51a25..e39225d317952d5b17e2525f529ffe35a5a19766 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
@@ -69,7 +69,8 @@ private:
};
/// Typedef singleton instance to ForegroundFactory
-using ForegroundModelFactory = Kernel::SingletonHolder<ForegroundModelFactoryImpl>;
+using ForegroundModelFactory =
+ Kernel::SingletonHolder<ForegroundModelFactoryImpl>;
}
}
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
index 4ccac15f70c6244a9ce98c3497b4025226a3e488..7f6e826cba433b76ce73012e1d351c1ee596fe46 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
@@ -70,7 +70,8 @@ private:
};
/// Typedef singleton instance to MDResolutionConvolutionFactory
-using MDResolutionConvolutionFactory = Kernel::SingletonHolder<MDResolutionConvolutionFactoryImpl>;
+using MDResolutionConvolutionFactory =
+ Kernel::SingletonHolder<MDResolutionConvolutionFactoryImpl>;
}
}
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h
index 2b15e099219fd9750af4e4e7773e0eb7328846d3..d869716128e4943b2e8f2682791041eea930d14a 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h
@@ -66,7 +66,8 @@ private:
/// The input domain
boost::shared_ptr<API::FunctionValues> m_calculatedValues;
/// The output workspace type
- using QOmegaWorkspace = DataObjects::MDEventWorkspace<DataObjects::MDEvent<4>, 4>;
+ using QOmegaWorkspace =
+ DataObjects::MDEventWorkspace<DataObjects::MDEvent<4>, 4>;
/// The output workspace
boost::shared_ptr<QOmegaWorkspace> m_outputWS;
diff --git a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
index c98032f79725b2638d278c0d5b53ea9ed484a8e5..c4ca06ff0f135c8685d780fc9b15bcf749480f03 100644
--- a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
+++ b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
@@ -450,7 +450,7 @@ void MDNormDirectSC::calculateNormalization(
PhysicalConstants::meV * 1e-20 /
(PhysicalConstants::h * PhysicalConstants::h);
const auto &exptInfoZero = *(m_inputWS->getExperimentInfo(0));
- using VectorDoubleProperty = Kernel::PropertyWithValue<std::vector<double> >;
+ using VectorDoubleProperty = Kernel::PropertyWithValue<std::vector<double>>;
auto *rubwLog =
dynamic_cast<VectorDoubleProperty *>(exptInfoZero.getLog("RUBW_MATRIX"));
if (!rubwLog) {
diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp
index bc80e73cfbb840d20a3219042a0a094a6fdb0121..2d4d6ba7423387dc9d7c9cc15da572903cf7252f 100644
--- a/Framework/MDAlgorithms/src/MDNormSCD.cpp
+++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp
@@ -403,7 +403,7 @@ void MDNormSCD::calculateNormalization(
getProperty("SolidAngleWorkspace");
const auto &exptInfoZero = *(m_inputWS->getExperimentInfo(0));
- using VectorDoubleProperty = Kernel::PropertyWithValue<std::vector<double> >;
+ using VectorDoubleProperty = Kernel::PropertyWithValue<std::vector<double>>;
auto *rubwLog =
dynamic_cast<VectorDoubleProperty *>(exptInfoZero.getLog("RUBW_MATRIX"));
if (!rubwLog) {
diff --git a/Framework/MDAlgorithms/src/SaveMD.cpp b/Framework/MDAlgorithms/src/SaveMD.cpp
index 57e53480d49aff155424f58ccb792c095c952fe0..9461c7ac2a76cb36ce72f8a66a1a0178ad06e2ee 100644
--- a/Framework/MDAlgorithms/src/SaveMD.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD.cpp
@@ -17,7 +17,7 @@
#include "MantidKernel/System.h"
#include <Poco/File.h>
-using file_holder_type = std::unique_ptr< ::NeXus::File>;
+using file_holder_type = std::unique_ptr<::NeXus::File>;
using namespace Mantid::Kernel;
using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/SaveMD2.cpp b/Framework/MDAlgorithms/src/SaveMD2.cpp
index 56db72040b16f9fe8d27f73a90b8e02a15de6749..6f5717415df4da2a482a329c18c93626eb88005d 100644
--- a/Framework/MDAlgorithms/src/SaveMD2.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD2.cpp
@@ -18,7 +18,7 @@
#include "MantidDataObjects/BoxControllerNeXusIO.h"
#include "MantidKernel/ConfigService.h"
-using file_holder_type = std::unique_ptr< ::NeXus::File>;
+using file_holder_type = std::unique_ptr<::NeXus::File>;
using namespace Mantid::Kernel;
using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/SmoothMD.cpp b/Framework/MDAlgorithms/src/SmoothMD.cpp
index 6f2891f264076fcbf53b0bd6e758d89fca1bd92f..34d380cd7b6ccd0d7d0a4cd336a615fcb0a8ef68 100644
--- a/Framework/MDAlgorithms/src/SmoothMD.cpp
+++ b/Framework/MDAlgorithms/src/SmoothMD.cpp
@@ -36,10 +36,13 @@ using WidthVector = std::vector<double>;
using KernelVector = std::vector<double>;
// Typedef for an optional md histo workspace
-using OptionalIMDHistoWorkspace_const_sptr = boost::optional<IMDHistoWorkspace_const_sptr>;
+using OptionalIMDHistoWorkspace_const_sptr =
+ boost::optional<IMDHistoWorkspace_const_sptr>;
// Typedef for a smoothing function
-using SmoothFunction = boost::function<IMDHistoWorkspace_sptr (IMDHistoWorkspace_const_sptr, const WidthVector &, OptionalIMDHistoWorkspace_const_sptr)>;
+using SmoothFunction = boost::function<IMDHistoWorkspace_sptr(
+ IMDHistoWorkspace_const_sptr, const WidthVector &,
+ OptionalIMDHistoWorkspace_const_sptr)>;
// Typedef for a smoothing function map keyed by name.
using SmoothFunctionMap = std::map<std::string, SmoothFunction>;
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/AsType.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/AsType.h
index ba484e5494196179f5875abe4f644c93ce84c69a..d926e13c9259f8f133d0a22af2fde61dfadf9476 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/AsType.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/AsType.h
@@ -73,7 +73,11 @@ template <class ReturnType> struct AsType {
template <class InputType> struct apply {
// Deduce if type is correct for policy, needs to be convertible to
// ReturnType
- using type = typename boost::mpl::if_c<std::is_convertible<InputType, ReturnType>::value, AsTypeImpl<ReturnType, InputType>, AsType_Requires_New_Type_Automatically_Convertible_To_Original<InputType> >::type;
+ using type = typename boost::mpl::if_c<
+ std::is_convertible<InputType, ReturnType>::value,
+ AsTypeImpl<ReturnType, InputType>,
+ AsType_Requires_New_Type_Automatically_Convertible_To_Original<
+ InputType>>::type;
};
};
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/MatrixToNumpy.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/MatrixToNumpy.h
index 2a4ef9f0d6f69f45c415122cdd3aebe36b6e1a49..1d33ec6e22ba80fe16764fc7aba3f7a7b3472ed9 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/MatrixToNumpy.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/MatrixToNumpy.h
@@ -88,9 +88,14 @@ template <typename ConversionPolicy> struct MatrixRefToNumpy {
template <class T> struct apply {
// Typedef that removes and const or reference qualifiers from the return
// type
- using non_const_type = typename std::remove_const<typename std::remove_reference<T>::type>::type;
+ using non_const_type = typename std::remove_const<
+ typename std::remove_reference<T>::type>::type;
// MPL compile-time check that T is a reference to a Kernel::Matrix
- using type = typename boost::mpl::if_c<boost::mpl::and_<std::is_reference<T>, is_matrix<non_const_type> >::value, MatrixRefToNumpyImpl<non_const_type, ConversionPolicy>, MatrixRefToNumpy_Requires_Reference_To_Matrix_Return_Type<T> >::type;
+ using type = typename boost::mpl::if_c<
+ boost::mpl::and_<std::is_reference<T>,
+ is_matrix<non_const_type>>::value,
+ MatrixRefToNumpyImpl<non_const_type, ConversionPolicy>,
+ MatrixRefToNumpy_Requires_Reference_To_Matrix_Return_Type<T>>::type;
};
};
@@ -128,7 +133,10 @@ struct MatrixToNumpy {
// Typedef that removes any const from the type
using non_const_type = typename std::remove_const<T>::type;
// MPL compile-time check that T is a std::vector
- using type = typename boost::mpl::if_c<is_matrix<non_const_type>::value, MatrixRefToNumpyImpl<non_const_type, Converters::Clone>, MatrixToNumpy_Requires_Matrix_Return_By_Value<T> >::type;
+ using type = typename boost::mpl::if_c<
+ is_matrix<non_const_type>::value,
+ MatrixRefToNumpyImpl<non_const_type, Converters::Clone>,
+ MatrixToNumpy_Requires_Matrix_Return_By_Value<T>>::type;
};
};
}
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/RemoveConst.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/RemoveConst.h
index 911c6f796024bc814c1950d00b17a4dd9518a75d..fea7b26f85d6d16c95dabd4628d8bd3ac37cdaf7 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/RemoveConst.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/RemoveConst.h
@@ -100,7 +100,8 @@ template <typename T> struct RemoveConst_Requires_Pointer_Return_Value {};
// call to this struct
template <typename ConstSharedPtr> struct RemoveConstSharedPtrImpl {
using ConstElementType = typename ConstSharedPtr::element_type;
- using NonConstElementType = typename std::remove_const<ConstElementType>::type;
+ using NonConstElementType =
+ typename std::remove_const<ConstElementType>::type;
using NonConstSharedPtr = typename boost::shared_ptr<NonConstElementType>;
inline PyObject *operator()(const ConstSharedPtr &p) const {
@@ -129,7 +130,9 @@ struct RemoveConstSharedPtr_Requires_SharedPtr_Const_T_Pointer_Return_Value {};
struct RemoveConst {
template <class T> struct apply {
// Deduce if type is correct for policy, needs to be a "T*"
- using type = typename boost::mpl::if_c<std::is_pointer<T>::value, RemoveConstImpl<T>, RemoveConst_Requires_Pointer_Return_Value<T> >::type;
+ using type = typename boost::mpl::if_c<
+ std::is_pointer<T>::value, RemoveConstImpl<T>,
+ RemoveConst_Requires_Pointer_Return_Value<T>>::type;
};
};
@@ -140,7 +143,10 @@ struct RemoveConstSharedPtr {
template <class T> struct apply {
// Deduce if type is correct for policy, needs to be a
// "boost::shared_ptr<T>"
- using type = typename boost::mpl::if_c<IsConstSharedPtr<T>::value, RemoveConstSharedPtrImpl<T>, RemoveConstSharedPtr_Requires_SharedPtr_Const_T_Pointer_Return_Value<T> >::type;
+ using type = typename boost::mpl::if_c<
+ IsConstSharedPtr<T>::value, RemoveConstSharedPtrImpl<T>,
+ RemoveConstSharedPtr_Requires_SharedPtr_Const_T_Pointer_Return_Value<
+ T>>::type;
};
};
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/ToWeakPtr.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/ToWeakPtr.h
index b8e0de8b9446ff13a0a82b7ae5227a46dd94456a..ba9e1d2eff1451d792d429f2d0256e9409f18966 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/ToWeakPtr.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/ToWeakPtr.h
@@ -80,7 +80,9 @@ template <typename T> struct ToWeakPtr_Requires_Shared_Ptr_Return_Value {};
struct ToWeakPtr {
template <class T> struct apply {
// Deduce if type is correct for policy
- using type = typename boost::mpl::if_c<IsSharedPtr<T>::value, ToWeakPtrImpl<T>, ToWeakPtr_Requires_Shared_Ptr_Return_Value<T> >::type;
+ using type = typename boost::mpl::if_c<
+ IsSharedPtr<T>::value, ToWeakPtrImpl<T>,
+ ToWeakPtr_Requires_Shared_Ptr_Return_Value<T>>::type;
};
};
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/VectorToNumpy.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/VectorToNumpy.h
index a8f712d7196946203dc1fd7c2cfc0fc507a886cf..7f7cb2046bbd654eed8eb6318cba82bba57699d2 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/VectorToNumpy.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Policies/VectorToNumpy.h
@@ -85,9 +85,14 @@ template <typename ConversionPolicy> struct VectorRefToNumpy {
// The boost::python framework calls return_value_policy::apply<T>::type
template <class T> struct apply {
// Typedef that removes and const or reference qualifiers from the type
- using non_const_type = typename std::remove_const<typename std::remove_reference<T>::type>::type;
+ using non_const_type = typename std::remove_const<
+ typename std::remove_reference<T>::type>::type;
// MPL compile-time check that T is a reference to a std::vector
- using type = typename boost::mpl::if_c<boost::mpl::and_<std::is_reference<T>, is_std_vector<non_const_type> >::value, VectorRefToNumpyImpl<non_const_type, ConversionPolicy>, VectorRefToNumpy_Requires_Reference_To_StdVector_Return_Type<T> >::type;
+ using type = typename boost::mpl::if_c<
+ boost::mpl::and_<std::is_reference<T>,
+ is_std_vector<non_const_type>>::value,
+ VectorRefToNumpyImpl<non_const_type, ConversionPolicy>,
+ VectorRefToNumpy_Requires_Reference_To_StdVector_Return_Type<T>>::type;
};
};
@@ -126,7 +131,10 @@ struct VectorToNumpy {
// Typedef that removes any const from the type
using non_const_type = typename std::remove_const<T>::type;
// MPL compile-time check that T is a std::vector
- using type = typename boost::mpl::if_c<is_std_vector<non_const_type>::value, VectorRefToNumpyImpl<non_const_type, Converters::Clone>, VectorToNumpy_Requires_StdVector_Return_By_Value<T> >::type;
+ using type = typename boost::mpl::if_c<
+ is_std_vector<non_const_type>::value,
+ VectorRefToNumpyImpl<non_const_type, Converters::Clone>,
+ VectorToNumpy_Requires_StdVector_Return_By_Value<T>>::type;
};
};
}
diff --git a/Framework/PythonInterface/mantid/api/src/CloneMatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/CloneMatrixWorkspace.cpp
index 80b6cae9b8555623b4a9674dfd92b6d9f4205a5d..082b034567b446ea46f054a6792314d5765383a2 100644
--- a/Framework/PythonInterface/mantid/api/src/CloneMatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/CloneMatrixWorkspace.cpp
@@ -38,7 +38,8 @@ PyArrayObject *cloneArray(MatrixWorkspace &workspace, DataField field,
npy_intp stride(0);
// Find out which function we need to call to access the data
- using ArrayAccessFn = const MantidVec &(MatrixWorkspace::*)(const size_t) const;
+ using ArrayAccessFn =
+ const MantidVec &(MatrixWorkspace::*)(const size_t) const;
ArrayAccessFn dataAccesor;
/**
* Can do better than this with a templated object that knows how to access
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index e4a4c0ed987759f91efe6c4e35bc4521efa7f8d5..d2621202c0deb7c2dd0b539c769be78a4e31201b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -40,13 +40,24 @@ using PythonParallelAlgorithm = AlgorithmAdapter<ParallelAlgorithm>;
using PythonDistributedAlgorithm = AlgorithmAdapter<DistributedAlgorithm>;
// declarePyAlgProperty(property*,doc)
-using declarePropertyType1 = void (*)(boost::python::object &, Mantid::Kernel::Property *, const std::string &);
+using declarePropertyType1 = void (*)(boost::python::object &,
+ Mantid::Kernel::Property *,
+ const std::string &);
// declarePyAlgProperty(name, defaultValue, validator, doc, direction)
-using declarePropertyType2 = void (*)(boost::python::object &, const std::string &, const boost::python::object &, const boost::python::object &, const std::string &, const int);
+using declarePropertyType2 = void (*)(boost::python::object &,
+ const std::string &,
+ const boost::python::object &,
+ const boost::python::object &,
+ const std::string &, const int);
// declarePyAlgProperty(name, defaultValue, doc, direction)
-using declarePropertyType3 = void (*)(boost::python::object &, const std::string &, const boost::python::object &, const std::string &, const int);
+using declarePropertyType3 = void (*)(boost::python::object &,
+ const std::string &,
+ const boost::python::object &,
+ const std::string &, const int);
// declarePyAlgProperty(name, defaultValue, direction)
-using declarePropertyType4 = void (*)(boost::python::object &, const std::string &, const boost::python::object &, const int);
+using declarePropertyType4 = void (*)(boost::python::object &,
+ const std::string &,
+ const boost::python::object &, const int);
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp
index 5fb70dde0595848acc5e7440615cd8c78597d03c..69bb97725cdc805b6e4e5fe9ec3ec711bd7fa1a4 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp
@@ -11,7 +11,8 @@ using namespace boost::python;
GET_POINTER_SPECIALIZATION(AnalysisDataServiceImpl)
void export_AnalysisDataService() {
- using ADSExporter = DataServiceExporter<AnalysisDataServiceImpl, Workspace_sptr>;
+ using ADSExporter =
+ DataServiceExporter<AnalysisDataServiceImpl, Workspace_sptr>;
auto pythonClass = ADSExporter::define("AnalysisDataServiceImpl");
pythonClass.def("Instance", &AnalysisDataService::Instance,
return_value_policy<reference_existing_object>(),
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp b/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp
index 9648e9df024891c1f6d42e6a5f6a31418e1028d7..2b17e22dd61246cdda5b989c54b92d9d9cc6b6d3 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp
@@ -18,19 +18,35 @@ void export_BinaryOperations() {
using namespace boost::python;
// Typedefs the various function types
- using binary_fn_md_md = IMDWorkspace_sptr (*)(const IMDWorkspace_sptr, const IMDWorkspace_sptr, const std::string &, const std::string &, bool, bool);
- using binary_fn_md_gp = WorkspaceGroup_sptr (*)(const IMDWorkspace_sptr, const WorkspaceGroup_sptr, const std::string &, const std::string &, bool, bool);
- using binary_fn_gp_md = WorkspaceGroup_sptr (*)(const WorkspaceGroup_sptr, const IMDWorkspace_sptr, const std::string &, const std::string &, bool, bool);
- using binary_fn_gp_gp = WorkspaceGroup_sptr (*)(const WorkspaceGroup_sptr, const WorkspaceGroup_sptr, const std::string &, const std::string &, bool, bool);
-
- using binary_fn_mh_mh = IMDHistoWorkspace_sptr (*)(const IMDHistoWorkspace_sptr, const IMDHistoWorkspace_sptr, const std::string &, const std::string &, bool, bool);
-
- using binary_fn_md_db = IMDWorkspace_sptr (*)(const IMDWorkspace_sptr, double, const std::string &, const std::string &, bool, bool);
- using binary_fn_mh_db = IMDHistoWorkspace_sptr (*)(const IMDHistoWorkspace_sptr, double, const std::string &, const std::string &, bool, bool);
- using binary_fn_gp_db = WorkspaceGroup_sptr (*)(const WorkspaceGroup_sptr, double, const std::string &, const std::string &, bool, bool);
+ using binary_fn_md_md = IMDWorkspace_sptr (
+ *)(const IMDWorkspace_sptr, const IMDWorkspace_sptr, const std::string &,
+ const std::string &, bool, bool);
+ using binary_fn_md_gp = WorkspaceGroup_sptr (
+ *)(const IMDWorkspace_sptr, const WorkspaceGroup_sptr,
+ const std::string &, const std::string &, bool, bool);
+ using binary_fn_gp_md = WorkspaceGroup_sptr (
+ *)(const WorkspaceGroup_sptr, const IMDWorkspace_sptr,
+ const std::string &, const std::string &, bool, bool);
+ using binary_fn_gp_gp = WorkspaceGroup_sptr (
+ *)(const WorkspaceGroup_sptr, const WorkspaceGroup_sptr,
+ const std::string &, const std::string &, bool, bool);
+
+ using binary_fn_mh_mh = IMDHistoWorkspace_sptr (
+ *)(const IMDHistoWorkspace_sptr, const IMDHistoWorkspace_sptr,
+ const std::string &, const std::string &, bool, bool);
+
+ using binary_fn_md_db = IMDWorkspace_sptr (
+ *)(const IMDWorkspace_sptr, double, const std::string &,
+ const std::string &, bool, bool);
+ using binary_fn_mh_db = IMDHistoWorkspace_sptr (
+ *)(const IMDHistoWorkspace_sptr, double, const std::string &,
+ const std::string &, bool, bool);
+ using binary_fn_gp_db = WorkspaceGroup_sptr (
+ *)(const WorkspaceGroup_sptr, double, const std::string &,
+ const std::string &, bool, bool);
// Always a return a Workspace_sptr
- using ReturnWorkspaceSptr = return_value_policy<AsType<Workspace_sptr> >;
+ using ReturnWorkspaceSptr = return_value_policy<AsType<Workspace_sptr>>;
// Binary operations that return a workspace
using boost::python::def;
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp
index 88a617d4bb951551cfd617ff08c5804bb4d3f22e..60de8bbbdceb55aa41fb0cfe8711b3dacaabe947 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/CompositeFunction.cpp
@@ -13,9 +13,11 @@ GET_POINTER_SPECIALIZATION(CompositeFunction)
namespace {
using getParameterType1 = double (CompositeFunction::*)(size_t) const;
-using getParameterType2 = double (CompositeFunction::*)(const std::string &) const;
+using getParameterType2 =
+ double (CompositeFunction::*)(const std::string &) const;
-using setParameterType2 = void (CompositeFunction::*)(const std::string &, const double &, bool);
+using setParameterType2 = void (CompositeFunction::*)(const std::string &,
+ const double &, bool);
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index be19095f2fb033861e7a41bbd0179cb045b069eb..7e892d026eede727bcfba7cac687088afa232f49 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -54,7 +54,8 @@ GCC_DIAG_OFF(conversion)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
setParameter, 2, 3)
// setProperty(index,value,explicit)
-using setParameterType2 = void (IFunction::*)(const std::string &, const double &, bool);
+using setParameterType2 = void (IFunction::*)(const std::string &,
+ const double &, bool);
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads,
setParameter, 2, 3)
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(tie_Overloads, tie, 2, 3)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 390c73c4957b98db87a8320b0a0dfc253ac4b100..38480dd58b8333c362055397a39beafa044a33e0 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -38,12 +38,15 @@ GET_POINTER_SPECIALIZATION(MatrixWorkspace)
namespace {
/// Typedef for data access, i.e. dataX,Y,E members
-using data_modifier = Mantid::MantidVec &(MatrixWorkspace::*)(const std::size_t);
+using data_modifier =
+ Mantid::MantidVec &(MatrixWorkspace::*)(const std::size_t);
/// return_value_policy for read-only numpy array
-using return_readonly_numpy = return_value_policy<VectorRefToNumpy<WrapReadOnly> >;
+using return_readonly_numpy =
+ return_value_policy<VectorRefToNumpy<WrapReadOnly>>;
/// return_value_policy for read-write numpy array
-using return_readwrite_numpy = return_value_policy<VectorRefToNumpy<WrapReadWrite> >;
+using return_readwrite_numpy =
+ return_value_policy<VectorRefToNumpy<WrapReadWrite>>;
//------------------------------- Overload macros ---------------------------
#ifdef __clang__
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp
index 9b8daa3240fd05ca207d8a3cc29b1faadf6e55af..8bce6bdea86d5e71236eda8f86c2396283508ff9 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp
@@ -17,7 +17,7 @@ using namespace boost::python;
namespace {
/// The PropertyWithValue type
-using HeldType = std::vector<std::vector<std::string> >;
+using HeldType = std::vector<std::vector<std::string>>;
/**
* Converts the value from a MultipleFileProperty to a python object rather than
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index c1cc7cc3584e4d2e29e9563729665737673a0a7e..3ded562f0ae9cd93aeb91bfc2902b7fa7e3ec651 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -73,7 +73,9 @@ void export_WorkspaceFactory() {
const char *createFromScratchDoc =
"Create a clean new worksapce of the given size.";
- using createFromScratchPtr = MatrixWorkspace_sptr (WorkspaceFactoryImpl::*)(const std::string &, const size_t &, const size_t &, const size_t &) const;
+ using createFromScratchPtr = MatrixWorkspace_sptr (
+ WorkspaceFactoryImpl::*)(const std::string &, const size_t &,
+ const size_t &, const size_t &) const;
class_<WorkspaceFactoryImpl, boost::noncopyable>("WorkspaceFactoryImpl",
no_init)
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
index 886d034e307f1b478f09f00a785e68aa38274c67..696b7904f1be53f8581b24550a3ba50687f4d2f2 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
@@ -42,7 +42,8 @@ void setR(Goniometer &self, const object &data) {
void export_Goniometer() {
// return_value_policy for read-only numpy array
- using return_readonly_numpy = return_value_policy<Policies::MatrixRefToNumpy<Converters::WrapReadOnly> >;
+ using return_readonly_numpy =
+ return_value_policy<Policies::MatrixRefToNumpy<Converters::WrapReadOnly>>;
class_<Goniometer>("Goniometer", init<>(arg("self")))
.def(init<Goniometer const &>((arg("self"), arg("other"))))
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
index 7b411cb9e74aa5e0ef839f83e6e47e787816cb3a..be82085147f67fe64a2cd5fa9dc2725631fac778 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
@@ -45,7 +45,8 @@ Mantid::Kernel::V3D hklFromQ(OrientedLattice &self, const object &vec) {
void export_OrientedLattice() {
/// return_value_policy for read-only numpy array
- using return_readonly_numpy = return_value_policy<Policies::MatrixRefToNumpy<Converters::WrapReadOnly> >;
+ using return_readonly_numpy =
+ return_value_policy<Policies::MatrixRefToNumpy<Converters::WrapReadOnly>>;
class_<OrientedLattice, bases<UnitCell>>(
"OrientedLattice",
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
index ca407057476cf643d05c03ce72fd1d4e985388b1..d8a6c0fb89ee2e190f7f353e413f8a705006c98a 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
@@ -67,7 +67,8 @@ void export_UnitCell() {
.export_values();
/// return_value_policy for read-only numpy array
- using return_readonly_numpy = return_value_policy<Policies::MatrixRefToNumpy<Converters::WrapReadOnly> >;
+ using return_readonly_numpy =
+ return_value_policy<Policies::MatrixRefToNumpy<Converters::WrapReadOnly>>;
class_<UnitCell>(
"UnitCell",
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp
index ba07c31b9f6a4e0833d2a1cfd5b5c25414516053..365d7a182bcfcd6f803b52e8a2b224fcc27c282d 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp
@@ -24,7 +24,8 @@ using namespace boost::python;
namespace {
/// return_value_policy for cloned numpy array
-using return_cloned_numpy = return_value_policy<Policies::VectorRefToNumpy<Converters::Clone> >;
+using return_cloned_numpy =
+ return_value_policy<Policies::VectorRefToNumpy<Converters::Clone>>;
#define EXPORT_ARRAY_PROP(type, prefix) \
class_<ArrayProperty<type>, bases<PropertyWithValue<std::vector<type>>>, \
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManagerDataService.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManagerDataService.cpp
index 5792ea62ff74f67183fd2b40e62367f8d75f14f1..4149d476e7a3877a50e0c3b01d265ba18da50f6f 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManagerDataService.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManagerDataService.cpp
@@ -48,7 +48,8 @@ void export_PropertyManagerDataService() {
register_ptr_to_python<PropertyManager_wptr>();
- using PMDExporter = DataServiceExporter<PropertyManagerDataServiceImpl, PropertyManager_sptr>;
+ using PMDExporter =
+ DataServiceExporter<PropertyManagerDataServiceImpl, PropertyManager_sptr>;
auto pmdType = PMDExporter::define("PropertyManagerDataServiceImpl");
pmdType.def("Instance", &PropertyManagerDataService::Instance,
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
index e8119bea4d8a90912be76ccb8c681c53ec65c3ee..ff875b0733244cf090d75c1c892324f3dddad479 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
@@ -180,7 +180,9 @@ GCC_DIAG_ON(conversion)
//============================================
// Function pointer to real implementation of getMoments
-using MomentsFunction = std::vector<double> (*)(const std::vector<double> &, const std::vector<double> &, const int);
+using MomentsFunction = std::vector<double>(*)(const std::vector<double> &,
+ const std::vector<double> &,
+ const int);
/**
* The implementation for getMomentsAboutOrigin & getMomentsAboutOriginMean for
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp
index e74509990f1811beb9ad3b3457402d6b2c2ba8d9..86d0f2bb481cec94d3e5ed4f2e7b65c4e60191ad 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp
@@ -7,7 +7,9 @@ using namespace boost::python;
void export_UnitConversion() {
// Function pointer typedef
- using StringVersion = double (*)(const std::string &, const std::string &, const double, const double, const double, const double, const DeltaEMode::Type, const double);
+ using StringVersion = double (
+ *)(const std::string &, const std::string &, const double, const double,
+ const double, const double, const DeltaEMode::Type, const double);
class_<UnitConversion, boost::noncopyable>("UnitConversion", no_init)
.def("run", (StringVersion)&UnitConversion::run,
diff --git a/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp b/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp
index a728650d18d06a4a765caa665ba6c52a768fe1f8..17530ed6d4faaea35ec4c662df9767326c1c3da1 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Registry/PropertyWithValueFactory.cpp
@@ -16,7 +16,8 @@ namespace PythonInterface {
namespace Registry {
namespace {
/// Lookup map type
-using PyTypeIndex = std::map<const PyTypeObject *, boost::shared_ptr<PropertyValueHandler> >;
+using PyTypeIndex =
+ std::map<const PyTypeObject *, boost::shared_ptr<PropertyValueHandler>>;
/**
* Initialize lookup map
@@ -66,7 +67,8 @@ const PyTypeIndex &getTypeIndex() {
}
// Lookup map for arrays
-using PyArrayIndex = std::map<std::string, boost::shared_ptr<PropertyValueHandler> >;
+using PyArrayIndex =
+ std::map<std::string, boost::shared_ptr<PropertyValueHandler>>;
/**
* Initialize lookup map
@@ -75,18 +77,18 @@ void initArrayLookup(PyArrayIndex &index) {
assert(index.empty());
// Map the Python array types to the best match in C++
- using FloatArrayHandler = SequenceTypeHandler<std::vector<double> >;
+ using FloatArrayHandler = SequenceTypeHandler<std::vector<double>>;
index.emplace("FloatArray", boost::make_shared<FloatArrayHandler>());
- using StringArrayHandler = SequenceTypeHandler<std::vector<std::string> >;
+ using StringArrayHandler = SequenceTypeHandler<std::vector<std::string>>;
index.emplace("StringArray", boost::make_shared<StringArrayHandler>());
- using LongIntArrayHandler = SequenceTypeHandler<std::vector<long> >;
+ using LongIntArrayHandler = SequenceTypeHandler<std::vector<long>>;
index.emplace("LongIntArray", boost::make_shared<LongIntArrayHandler>());
#if PY_MAJOR_VERSION < 3
// Backwards compatible behaviour
- using IntArrayHandler = SequenceTypeHandler<std::vector<int> >;
+ using IntArrayHandler = SequenceTypeHandler<std::vector<int>>;
index.emplace("IntArray", boost::make_shared<IntArrayHandler>());
#endif
}
diff --git a/Framework/PythonInterface/mantid/kernel/src/Registry/TypeRegistry.cpp b/Framework/PythonInterface/mantid/kernel/src/Registry/TypeRegistry.cpp
index 4c5d4cb6e91157ea52bf47cc9f77ad334904e997..eb9f856cde50767053cea1dabf85be82224e306d 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Registry/TypeRegistry.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Registry/TypeRegistry.cpp
@@ -15,7 +15,8 @@ namespace // <anonymous>
/// Typedef the map of type_info -> handler objects. We store
/// boost::python::type_info objects so that they work across DLL boundaries
/// unlike std::type_info objects
-using TypeIDMap = std::map<const boost::python::type_info, boost::shared_ptr<PropertyValueHandler> >;
+using TypeIDMap = std::map<const boost::python::type_info,
+ boost::shared_ptr<PropertyValueHandler>>;
/**
* Returns a reference to the static type map
diff --git a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
index 7dd55b3bdc43a1bbf4b2a48ffee45415ed688146..61e734beea9be664a4eb9a9c21c7889a1b7a578b 100644
--- a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
+++ b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
@@ -88,7 +88,8 @@ BOOST_PYTHON_MODULE(WorkspaceCreationHelper) {
//===================================
// Typedef for function pointer to disabiguate references
- using Signature1_MDHisto = MDHistoWorkspace_sptr (*)(double, size_t, size_t, Mantid::coord_t, double, std::string, double);
+ using Signature1_MDHisto = MDHistoWorkspace_sptr (
+ *)(double, size_t, size_t, Mantid::coord_t, double, std::string, double);
def("makeFakeMDHistoWorkspace", (Signature1_MDHisto)&makeFakeMDHistoWorkspace,
makeFakeMDHistoWorkspace_overloads()
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
index a9f5665ea06500c261923d52b2d25f7e7d67cfb8..66d3c4b5b42c0dd14eae1ea94f436d439518f377 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
@@ -45,7 +45,8 @@ public:
const std::string &propertyName) const = 0;
};
-using AbstractDoubleValueExtractor_sptr = boost::shared_ptr<AbstractDoubleValueExtractor>;
+using AbstractDoubleValueExtractor_sptr =
+ boost::shared_ptr<AbstractDoubleValueExtractor>;
class NumberDoubleValueExtractor : public AbstractDoubleValueExtractor {
public:
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSourceSpectrum.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSourceSpectrum.h
index cdbcadabbcdf6da1280e0b4ad09ac1d02d5bd583..fd5761a402dba9114172d49f9f2f8b1a77e4ce73 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSourceSpectrum.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSourceSpectrum.h
@@ -60,7 +60,8 @@ protected:
};
using PoldiSourceSpectrum_sptr = boost::shared_ptr<PoldiSourceSpectrum>;
-using PoldiSourceSpectrum_const_sptr = boost::shared_ptr<const PoldiSourceSpectrum>;
+using PoldiSourceSpectrum_const_sptr =
+ boost::shared_ptr<const PoldiSourceSpectrum>;
}
}
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiTimeTransformer.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiTimeTransformer.h
index 4b43516f6fdd09f81ac10bde1759e60bb852b84f..798d08fb11b2a242eddb0f6857ad83287b06296b 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiTimeTransformer.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiTimeTransformer.h
@@ -93,7 +93,8 @@ protected:
double m_tofFactor;
};
-using DetectorElementData_const_sptr = boost::shared_ptr<const DetectorElementData>;
+using DetectorElementData_const_sptr =
+ boost::shared_ptr<const DetectorElementData>;
class MANTID_SINQ_DLL PoldiTimeTransformer {
public: