diff --git a/Framework/API/inc/MantidAPI/ICatalogInfoService.h b/Framework/API/inc/MantidAPI/ICatalogInfoService.h
index dea2b3bdbe4663fea89566637f20a159179a032c..fef462a41a2d50e0c03ddd899d43d4098e813711 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 b7a024450eb87ed0569546ee19891a088167975c..6f671927cf76b59964677e3195feb719b4a26dfd 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 78f562d2248856f733c37bac7789570c6a897533..a0ec788a261d54d2728bc831b848e75e8f2c6217 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 df8419c2fa91abbc7a23e91b4307c4cf0d910718..efc256f68eeeda2cbe227c947513ec9481cccef5 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 c218a9078cf54ec9812a3bf1220006c11614c0ca..291ba9adfa008b6a28fce5605cf73ed860062c35 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 46d8aca207054089a75d37e9681cb6ff1bf13d58..aa4b536864545893707ebc02c8728c9470dc9cac 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 ed8e08590703c05e3eb2c077b4d749e5b8cb6dee..1692e4647a5063c7603d05be461588228f366a47 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 61f405f65fe3514949f80a50d592dff6048be162..4846bb102e10000ebb8a40c1fb2b70943a7131f2 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 268e6219ecbe7c4f0a4dd331760e2bcc09a111a2..db0adf440ddde257d57b1dac7ba17266fedaf8b4 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 d2ef62e9d76421c213ded80dd4de24de3852ef45..586c963c4f6b7ffff36ce7996bc58adfc987a93a 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 93b7fab66f124f0b96564db30a313c6768fe378f..46de8bd791d337a10365b18421bb5f5fba0d1650 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;