From f9b677ca72a2da9373a3c169ac3c871ab7b83d68 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Thu, 15 Mar 2018 14:14:59 +0000
Subject: [PATCH] Re #22048: Applied manual fixes.
These fixes were not applied by clang-tidy because they are either
inside a macro, not included by any source files or conditionally
compiled on a condition which is false on my OS.
They were found using grep -rnI '^[^/#*]*typedef' Framework/
---
Framework/API/inc/MantidAPI/ICatalogInfoService.h | 5 ++---
Framework/API/inc/MantidAPI/SingleValueParameter.h | 2 +-
Framework/API/inc/MantidAPI/SingleValueParameterParser.h | 4 ++--
Framework/API/inc/MantidAPI/VectorParameter.h | 2 +-
Framework/DataObjects/test/WorkspaceIteratorTest.h | 8 ++++----
Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h | 8 ++++----
Framework/Kernel/src/NetworkProxyOSX.cpp | 2 +-
.../inc/MantidMDAlgorithms/Vector3DParameter.h | 2 +-
.../kernel/Converters/CArrayToNDArray.h | 2 +-
.../mantid/api/src/Exports/ProductFunction.cpp | 9 +++++----
.../inc/MantidTestHelpers/MDEventsTestHelper.h | 2 +-
11 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/ICatalogInfoService.h b/Framework/API/inc/MantidAPI/ICatalogInfoService.h
index dea2b3bdbe4..fef462a41a2 100644
--- a/Framework/API/inc/MantidAPI/ICatalogInfoService.h
+++ b/Framework/API/inc/MantidAPI/ICatalogInfoService.h
@@ -52,9 +52,8 @@ public:
virtual ITableWorkspace_sptr getPublishInvestigations() = 0;
};
-typedef boost::shared_ptr<ICatalogInfoService> ICatalogInfoService_sptr;
-typedef boost::shared_ptr<const ICatalogInfoService>
- ICatalogInfoService_const_sptr;
+using ICatalogInfoService_sptr = boost::shared_ptr<ICatalogInfoService>;
+using ICatalogInfoService_const_sptr = boost::shared_ptr<const ICatalogInfoService>;
}
}
diff --git a/Framework/API/inc/MantidAPI/SingleValueParameter.h b/Framework/API/inc/MantidAPI/SingleValueParameter.h
index b7a024450eb..6f671927cf7 100644
--- a/Framework/API/inc/MantidAPI/SingleValueParameter.h
+++ b/Framework/API/inc/MantidAPI/SingleValueParameter.h
@@ -159,7 +159,7 @@ std::string SingleValueParameter<Derived, ValType>::toXMLString() const {
class classname \
: public Mantid::API::SingleValueParameter<classname, type_> { \
public: \
- typedef Mantid::API::SingleValueParameter<classname, type_> SuperType; \
+ using SuperType = Mantid::API::SingleValueParameter<classname, type_> \
static std::string parameterName() { return #classname; } \
classname(type_ value) : SuperType(value) {} \
classname() : SuperType() {} \
diff --git a/Framework/API/inc/MantidAPI/SingleValueParameterParser.h b/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
index 78f562d2248..a0ec788a261 100644
--- a/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
+++ b/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
@@ -79,7 +79,7 @@ template <class SingleValueParameterType>
Mantid::API::ImplicitFunctionParameter *
SingleValueParameterParser<SingleValueParameterType>::createParameter(
Poco::XML::Element *parameterElement) {
- typedef typename SingleValueParameterType::ValueType ValType;
+ using ValType = typename SingleValueParameterType::ValueType;
std::string typeName = parameterElement->getChildElement("Type")->innerText();
if (SingleValueParameterType::parameterName() != typeName) {
return m_successor->createParameter(parameterElement);
@@ -101,7 +101,7 @@ template <class SingleValueParameterType>
SingleValueParameterType *
SingleValueParameterParser<SingleValueParameterType>::createWithoutDelegation(
Poco::XML::Element *parameterElement) {
- typedef typename SingleValueParameterType::ValueType ValType;
+ using ValType = typename SingleValueParameterType::ValueType;
std::string typeName = parameterElement->getChildElement("Type")->innerText();
if (SingleValueParameterType::parameterName() != typeName) {
throw std::runtime_error("The attempted ::createWithoutDelegation failed. "
diff --git a/Framework/API/inc/MantidAPI/VectorParameter.h b/Framework/API/inc/MantidAPI/VectorParameter.h
index df8419c2fa9..efc256f68ee 100644
--- a/Framework/API/inc/MantidAPI/VectorParameter.h
+++ b/Framework/API/inc/MantidAPI/VectorParameter.h
@@ -245,7 +245,7 @@ ElemType &VectorParameter<Derived, ElemType>::at(size_t index) {
#define DECLARE_VECTOR_PARAMETER(classname, type_) \
class classname : public Mantid::API::VectorParameter<classname, type_> { \
public: \
- typedef Mantid::API::VectorParameter<classname, type_> SuperType; \
+ using SuperType = Mantid::API::VectorParameter<classname, type_>; \
static std::string parameterName() { return #classname; } \
classname() : SuperType() {} \
classname(size_t index) : SuperType(index) {} \
diff --git a/Framework/DataObjects/test/WorkspaceIteratorTest.h b/Framework/DataObjects/test/WorkspaceIteratorTest.h
index c218a9078cf..291ba9adfa0 100644
--- a/Framework/DataObjects/test/WorkspaceIteratorTest.h
+++ b/Framework/DataObjects/test/WorkspaceIteratorTest.h
@@ -33,10 +33,10 @@ public:
class WorkspaceIteratorTest : public CxxTest::TestSuite {
private:
- typedef boost::shared_ptr<MantidVec> parray;
- typedef boost::shared_ptr<Workspace2D> W2D;
- typedef boost::shared_ptr<WorkspaceSingleValue> WSV;
- typedef boost::shared_ptr<MatrixWorkspace> Wbase;
+ using parray = boost::shared_ptr<MantidVec>;
+ using W2D = boost::shared_ptr<Workspace2D>;
+ using WSV = boost::shared_ptr<WorkspaceSingleValue>;
+ using Wbase = boost::shared_ptr<MatrixWorkspace>;
public:
void testIteratorWorkspace2DAsBase() {
diff --git a/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h b/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h
index 46d8aca2070..aa4b5368645 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDetector_fwd.h
@@ -34,13 +34,13 @@ namespace Geometry {
class IDetector;
/// Shared pointer to an IDetector object
-typedef boost::shared_ptr<IDetector> IDetector_sptr;
+using IDetector_sptr = boost::shared_ptr<IDetector>;
/// Shared pointer to an const IDetector object
-typedef boost::shared_ptr<const IDetector> IDetector_const_sptr;
+using IDetector_const_sptr = boost::shared_ptr<const IDetector>;
/// unique pointer to an IDetector
-typedef std::unique_ptr<IDetector> IDetector_uptr;
+using IDetector_uptr = std::unique_ptr<IDetector>;
/// unique pointer to an IDetector (const version)
-typedef std::unique_ptr<const IDetector> IDetector_const_uptr;
+using IDetector_const_uptr = std::unique_ptr<const IDetector>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Kernel/src/NetworkProxyOSX.cpp b/Framework/Kernel/src/NetworkProxyOSX.cpp
index ed8e0859070..1692e4647a5 100644
--- a/Framework/Kernel/src/NetworkProxyOSX.cpp
+++ b/Framework/Kernel/src/NetworkProxyOSX.cpp
@@ -43,7 +43,7 @@ enum ProxyType {
};
/// Typedef Collection of proxy information.
-typedef std::vector<ProxyInfo> ProxyInfoVec;
+using ProxyInfoVec = std::vector<ProxyInfo>;
/**
* Extract proxy information from a CFDistionaryRef
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameter.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameter.h
index 61f405f65fe..4846bb102e1 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameter.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameter.h
@@ -152,7 +152,7 @@ ElemType &Vector3DParameter<Derived, ElemType>::operator[](int index) {
class classname \
: public Mantid::MDAlgorithms::Vector3DParameter<classname, double> { \
public: \
- typedef Vector3DParameter<classname, type_> SuperType; \
+ using SuperType = Vector3DParameter<classname, type_> SuperType; \
static std::string parameterName() { return #classname; } \
classname(type_ a, type_ b, type_ c) : SuperType(a, b, c) {} \
classname() : SuperType() {} \
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/CArrayToNDArray.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/CArrayToNDArray.h
index 268e6219ecb..db0adf440dd 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/CArrayToNDArray.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Converters/CArrayToNDArray.h
@@ -45,7 +45,7 @@ struct CArrayToNDArray {
// Round about way of calling the wrapNDArray template function that is
// defined
// in the cpp file
- typedef typename ConversionPolicy::template apply<ElementType> policy;
+ using policy = typename ConversionPolicy::template apply<ElementType>;
return policy::createFromArray(carray, ndims, dims);
}
};
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/ProductFunction.cpp b/Framework/PythonInterface/mantid/api/src/Exports/ProductFunction.cpp
index d2ef62e9d76..586c963c4f6 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/ProductFunction.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/ProductFunction.cpp
@@ -8,11 +8,12 @@ using namespace boost::python;
namespace {
-typedef double (ProductFunction::*getParameterType1)(size_t) const;
-typedef double (ProductFunction::*getParameterType2)(const std::string &) const;
+using getParameterType1 = double (ProductFunction::*)(size_t) const;
+using getParameterType2 = double (ProductFunction::*)(const std::string &) const;
+
+using setParameterType2 = void (ProductFunction::*)(const std::string &,
+ const double &, bool);
-typedef void (ProductFunction::*setParameterType2)(const std::string &,
- const double &, bool);
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads,
setParameter, 2, 3)
}
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
index 93b7fab66f1..46de8bd791d 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
@@ -436,7 +436,7 @@ static void feedMDBox(MDBoxBase<MDLeanEvent<nd>, nd> *box, size_t repeat = 1,
template <size_t nd>
static void recurseSplit(MDGridBox<MDLeanEvent<nd>, nd> *box,
size_t atRecurseLevel, size_t recurseLimit) {
- typedef std::vector<MDBoxBase<MDLeanEvent<nd>, nd> *> boxVector;
+ using boxVector = std::vector<MDBoxBase<MDLeanEvent<nd>, nd> *>;
if (atRecurseLevel >= recurseLimit)
return;
--
GitLab