From d798b706902e79f73b943d9924e5dc3406875258 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Wed, 14 Mar 2018 13:53:18 +0000
Subject: [PATCH] Re #22048: Applied fixes to Framework/Geometry.
---
.../MantidGeometry/Crystal/BraggScatterer.h | 4 ++--
.../Crystal/BraggScattererFactory.h | 3 +--
.../BraggScattererInCrystalStructure.h | 3 +--
.../MantidGeometry/Crystal/CenteringGroup.h | 7 +++----
.../Crystal/CompositeBraggScatterer.h | 2 +-
.../MantidGeometry/Crystal/CrystalStructure.h | 2 +-
.../inc/MantidGeometry/Crystal/CyclicGroup.h | 4 ++--
.../inc/MantidGeometry/Crystal/Group.h | 4 ++--
.../inc/MantidGeometry/Crystal/HKLFilter.h | 2 +-
.../Crystal/IsotropicAtomBraggScatterer.h | 6 ++----
.../inc/MantidGeometry/Crystal/PeakShape.h | 4 ++--
.../MantidGeometry/Crystal/PeakTransform.h | 4 ++--
.../Crystal/PeakTransformFactory.h | 2 +-
.../MantidGeometry/Crystal/PeakTransformHKL.h | 2 +-
.../Crystal/PeakTransformQLab.h | 3 +--
.../Crystal/PeakTransformQSample.h | 3 +--
.../Crystal/PeakTransformSelector.h | 2 +-
.../inc/MantidGeometry/Crystal/PointGroup.h | 5 ++---
.../Crystal/PointGroupFactory.h | 5 ++---
.../Crystal/ReflectionCondition.h | 2 +-
.../inc/MantidGeometry/Crystal/SpaceGroup.h | 4 ++--
.../Crystal/SpaceGroupFactory.h | 6 ++----
.../Crystal/StructureFactorCalculator.h | 3 +--
.../StructureFactorCalculatorSummation.h | 3 +--
.../MantidGeometry/Crystal/SymmetryElement.h | 16 +++++++--------
.../Crystal/SymmetryElementFactory.h | 6 ++----
.../Crystal/SymmetryOperationFactory.h | 3 +--
.../Geometry/inc/MantidGeometry/Crystal/V3R.h | 2 +-
.../inc/MantidGeometry/ICompAssembly.h | 4 ++--
.../Geometry/inc/MantidGeometry/IComponent.h | 6 +++---
.../Geometry/inc/MantidGeometry/IDTypes.h | 4 ++--
.../Geometry/inc/MantidGeometry/IDetector.h | 5 ++---
.../inc/MantidGeometry/IObjComponent.h | 4 ++--
.../Geometry/inc/MantidGeometry/Instrument.h | 6 ++----
.../MantidGeometry/Instrument/CompAssembly.h | 5 ++---
.../inc/MantidGeometry/Instrument/Container.h | 6 +++---
.../MantidGeometry/Instrument/DetectorGroup.h | 6 +++---
.../inc/MantidGeometry/Instrument/IDFObject.h | 4 ++--
.../Instrument/ObjCompAssembly.h | 9 ++++-----
.../inc/MantidGeometry/Instrument/Parameter.h | 2 +-
.../Instrument/ParameterFactory.h | 4 ++--
.../MantidGeometry/Instrument/ParameterMap.h | 20 +++++++------------
.../Instrument/RectangularDetector.h | 5 ++---
.../Instrument/StructuredDetector.h | 5 ++---
.../inc/MantidGeometry/Instrument_fwd.h | 8 ++++----
.../MDGeometry/CompositeImplicitFunction.h | 3 +--
.../MantidGeometry/MDGeometry/IMDDimension.h | 8 ++++----
.../inc/MantidGeometry/MDGeometry/MDFrame.h | 8 ++++----
.../MDGeometry/MDFrameFactory.h | 2 +-
.../MDGeometry/MDGeometryXMLBuilder.h | 2 +-
.../MDGeometry/MDHistoDimension.h | 4 ++--
.../MDGeometry/MDHistoDimensionBuilder.h | 2 +-
.../MDGeometry/MDImplicitFunction.h | 2 +-
.../inc/MantidGeometry/MDGeometry/MDTypes.h | 4 ++--
.../inc/MantidGeometry/Objects/BoundingBox.h | 4 ++--
.../inc/MantidGeometry/Objects/IObject.h | 8 ++++----
.../Objects/InstrumentRayTracer.h | 2 +-
.../MantidGeometry/Surfaces/SurfaceFactory.h | 3 +--
.../Geometry/src/Instrument/FitParameter.cpp | 2 +-
.../SampleEnvironmentSpecParser.cpp | 2 +-
.../src/Instrument/XMLInstrumentParameter.cpp | 3 +--
Framework/Geometry/src/Math/mathSupport.cpp | 2 +-
Framework/Geometry/test/CSGObjectTest.h | 4 ++--
.../Geometry/test/MDBoxImplicitFunctionTest.h | 2 +-
.../Geometry/test/MatrixVectorPairTest.h | 2 +-
Framework/Geometry/test/ParameterMapTest.h | 4 +---
.../Geometry/test/PeakTransformSelectorTest.h | 6 +++---
.../test/XMLInstrumentParameterTest.h | 2 +-
68 files changed, 130 insertions(+), 166 deletions(-)
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
index 82f4460245b..40e0ebff6cd 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
@@ -13,11 +13,11 @@
namespace Mantid {
namespace Geometry {
-typedef std::complex<double> StructureFactor;
+using StructureFactor = std::complex<double>;
class BraggScatterer;
-typedef boost::shared_ptr<BraggScatterer> BraggScatterer_sptr;
+using BraggScatterer_sptr = boost::shared_ptr<BraggScatterer>;
/**
@class BraggScatterer
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
index a9782105dc3..be5ef1c6c67 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
@@ -85,8 +85,7 @@ private:
BraggScattererFactoryImpl();
};
-typedef Mantid::Kernel::SingletonHolder<BraggScattererFactoryImpl>
- BraggScattererFactory;
+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 b08fbe7e994..5c2a8287503 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
@@ -72,8 +72,7 @@ protected:
UnitCell m_cell;
};
-typedef boost::shared_ptr<BraggScattererInCrystalStructure>
- BraggScattererInCrystalStructure_sptr;
+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 85c03b85504..d70a80d40b3 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
@@ -65,8 +65,8 @@ protected:
std::string m_symbol;
};
-typedef boost::shared_ptr<CenteringGroup> CenteringGroup_sptr;
-typedef boost::shared_ptr<const CenteringGroup> CenteringGroup_const_sptr;
+using CenteringGroup_sptr = boost::shared_ptr<CenteringGroup>;
+using CenteringGroup_const_sptr = boost::shared_ptr<const CenteringGroup>;
/// Helper class to keep this out of the interface of CenteringGroup.
class MANTID_GEOMETRY_DLL CenteringGroupCreatorImpl {
@@ -94,8 +94,7 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<CenteringGroupCreatorImpl>;
};
-typedef Mantid::Kernel::SingletonHolder<CenteringGroupCreatorImpl>
- CenteringGroupCreator;
+using CenteringGroupCreator = Mantid::Kernel::SingletonHolder<CenteringGroupCreatorImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
index 49d08693628..c4317a23dad 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
@@ -59,7 +59,7 @@ namespace Geometry {
*/
class CompositeBraggScatterer;
-typedef boost::shared_ptr<CompositeBraggScatterer> CompositeBraggScatterer_sptr;
+using CompositeBraggScatterer_sptr = boost::shared_ptr<CompositeBraggScatterer>;
class MANTID_GEOMETRY_DLL CompositeBraggScatterer : public BraggScatterer {
public:
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.h
index cfa639ec75e..fe8787ea212 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CrystalStructure.h
@@ -116,7 +116,7 @@ protected:
CompositeBraggScatterer_sptr m_scatterers;
};
-typedef boost::shared_ptr<CrystalStructure> CrystalStructure_sptr;
+using CrystalStructure_sptr = boost::shared_ptr<CrystalStructure>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
index 8c1c07f5923..991c674c0b0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
@@ -89,8 +89,8 @@ protected:
generateAllOperations(const SymmetryOperation &operation) const;
};
-typedef boost::shared_ptr<CyclicGroup> CyclicGroup_sptr;
-typedef boost::shared_ptr<const CyclicGroup> CyclicGroup_const_sptr;
+using CyclicGroup_sptr = boost::shared_ptr<CyclicGroup>;
+using CyclicGroup_const_sptr = boost::shared_ptr<const CyclicGroup>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h b/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h
index ec5f164f140..459d2f6b27f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h
@@ -195,8 +195,8 @@ protected:
CoordinateSystem m_axisSystem;
};
-typedef boost::shared_ptr<Group> Group_sptr;
-typedef boost::shared_ptr<const Group> Group_const_sptr;
+using Group_sptr = boost::shared_ptr<Group>;
+using Group_const_sptr = boost::shared_ptr<const Group>;
namespace GroupFactory {
/// Creates a Group sub-class of type T if T has a constructor that takes a
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
index 04647bd3ee3..f687ff7e996 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
@@ -88,7 +88,7 @@ public:
virtual bool isAllowed(const Kernel::V3D &hkl) const = 0;
};
-typedef boost::shared_ptr<const HKLFilter> HKLFilter_const_sptr;
+using HKLFilter_const_sptr = boost::shared_ptr<const HKLFilter>;
/// Base class for unary logic operations for HKLFilter.
class MANTID_GEOMETRY_DLL HKLFilterUnaryLogicOperation : public HKLFilter {
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
index 890bcbbb1f6..aa241526f50 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
@@ -10,8 +10,7 @@ namespace Geometry {
class IsotropicAtomBraggScatterer;
-typedef boost::shared_ptr<IsotropicAtomBraggScatterer>
- IsotropicAtomBraggScatterer_sptr;
+using IsotropicAtomBraggScatterer_sptr = boost::shared_ptr<IsotropicAtomBraggScatterer>;
/** @class IsotropicAtomBraggScatterer
@@ -121,8 +120,7 @@ protected:
std::string m_label;
};
-typedef boost::shared_ptr<IsotropicAtomBraggScatterer>
- IsotropicAtomBraggScatterer_sptr;
+using IsotropicAtomBraggScatterer_sptr = boost::shared_ptr<IsotropicAtomBraggScatterer>;
class MANTID_GEOMETRY_DLL IsotropicAtomBraggScattererParser {
public:
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.h
index c23c23d963f..bed0e019497 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakShape.h
@@ -55,8 +55,8 @@ public:
virtual ~PeakShape() = default;
};
-typedef boost::shared_ptr<PeakShape> PeakShape_sptr;
-typedef boost::shared_ptr<const PeakShape> PeakShape_const_sptr;
+using PeakShape_sptr = boost::shared_ptr<PeakShape>;
+using PeakShape_const_sptr = boost::shared_ptr<const PeakShape>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.h
index a00796790c7..8af664f9342 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransform.h
@@ -56,8 +56,8 @@ protected:
};
/// Typedef for a PeakTransform wrapped in a shared_pointer.
-typedef boost::shared_ptr<PeakTransform> PeakTransform_sptr;
-typedef boost::shared_ptr<const PeakTransform> PeakTransform_const_sptr;
+using PeakTransform_sptr = boost::shared_ptr<PeakTransform>;
+using PeakTransform_const_sptr = boost::shared_ptr<const PeakTransform>;
/**
@class PeakTransformException
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.h
index 17acec02f1b..9cd3c1163b5 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformFactory.h
@@ -21,7 +21,7 @@ public:
};
/// Factory Shared Pointer typedef.
-typedef boost::shared_ptr<PeakTransformFactory> PeakTransformFactory_sptr;
+using PeakTransformFactory_sptr = boost::shared_ptr<PeakTransformFactory>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
index 260a392c415..774a1b1eb8e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
@@ -31,7 +31,7 @@ public:
};
/// Typedef a factory for type of PeaksTransform.
-typedef ConcretePeakTransformFactory<PeakTransformHKL> PeakTransformHKLFactory;
+using PeakTransformHKLFactory = ConcretePeakTransformFactory<PeakTransformHKL>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
index 1cb77266541..8d2f10ce2f8 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
@@ -31,8 +31,7 @@ public:
};
/// Typedef a factory for type of PeaksTransform.
-typedef ConcretePeakTransformFactory<PeakTransformQLab>
- PeakTransformQLabFactory;
+using PeakTransformQLabFactory = ConcretePeakTransformFactory<PeakTransformQLab>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
index f6e0e2b7bfe..cca344bbfcd 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
@@ -31,8 +31,7 @@ public:
};
/// Typedef a factory for type of PeaksTransform.
-typedef ConcretePeakTransformFactory<PeakTransformQSample>
- PeakTransformQSampleFactory;
+using PeakTransformQSampleFactory = ConcretePeakTransformFactory<PeakTransformQSample>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.h
index b7fe36dce4c..6706bcdb5d0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformSelector.h
@@ -34,7 +34,7 @@ private:
/// Disabled assigment operator
PeakTransformSelector &operator=(const PeakTransformSelector &);
/// Collection of candidate factories.
- typedef std::set<PeakTransformFactory_sptr> Factories;
+ using Factories = std::set<PeakTransformFactory_sptr>;
Factories m_candidateFactories;
};
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
index 0de5373f0a9..659807b5e1a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
@@ -77,7 +77,7 @@ protected:
};
/// Shared pointer to a PointGroup
-typedef boost::shared_ptr<PointGroup> PointGroup_sptr;
+using PointGroup_sptr = boost::shared_ptr<PointGroup>;
MANTID_GEOMETRY_DLL std::vector<PointGroup_sptr> getAllPointGroups();
@@ -107,8 +107,7 @@ struct MANTID_GEOMETRY_DLL CrystalSystemComparator {
const PointGroup::CrystalSystem &rhs) const;
};
-typedef std::multimap<PointGroup::CrystalSystem, PointGroup_sptr,
- CrystalSystemComparator> PointGroupCrystalSystemMap;
+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 6e22e4a622a..36fcf28c04b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
@@ -38,7 +38,7 @@ private:
PointGroup_sptr m_prototype;
};
-typedef boost::shared_ptr<PointGroupGenerator> PointGroupGenerator_sptr;
+using PointGroupGenerator_sptr = boost::shared_ptr<PointGroupGenerator>;
/**
@class PointGroupFactory
@@ -120,8 +120,7 @@ private:
boost::regex m_originChoiceRegex;
};
-typedef Mantid::Kernel::SingletonHolder<PointGroupFactoryImpl>
- PointGroupFactory;
+using PointGroupFactory = Mantid::Kernel::SingletonHolder<PointGroupFactoryImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
index 3eb01e35222..aa2a989a57f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
@@ -168,7 +168,7 @@ public:
};
/// Shared pointer to a ReflectionCondition
-typedef boost::shared_ptr<ReflectionCondition> ReflectionCondition_sptr;
+using ReflectionCondition_sptr = boost::shared_ptr<ReflectionCondition>;
MANTID_GEOMETRY_DLL std::vector<ReflectionCondition_sptr>
getAllReflectionConditions();
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
index 11a16a63a4c..26e56434b3d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
@@ -101,8 +101,8 @@ protected:
MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &stream,
const SpaceGroup &self);
-typedef boost::shared_ptr<SpaceGroup> SpaceGroup_sptr;
-typedef boost::shared_ptr<const SpaceGroup> SpaceGroup_const_sptr;
+using SpaceGroup_sptr = boost::shared_ptr<SpaceGroup>;
+using SpaceGroup_const_sptr = boost::shared_ptr<const SpaceGroup>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
index 49239db44a4..967f4dd95d3 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
@@ -61,8 +61,7 @@ private:
SpaceGroup_const_sptr m_prototype;
};
-typedef boost::shared_ptr<AbstractSpaceGroupGenerator>
- AbstractSpaceGroupGenerator_sptr;
+using AbstractSpaceGroupGenerator_sptr = boost::shared_ptr<AbstractSpaceGroupGenerator>;
/// Concrete space group generator that uses space group generators as given in
/// ITA.
@@ -265,8 +264,7 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<SpaceGroupFactoryImpl>;
};
-typedef Mantid::Kernel::SingletonHolder<SpaceGroupFactoryImpl>
- SpaceGroupFactory;
+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 0e14ff57b0e..d11c333c45e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculator.h
@@ -59,8 +59,7 @@ protected:
crystalStructureSetHook(const CrystalStructure &crystalStructure);
};
-typedef boost::shared_ptr<StructureFactorCalculator>
- StructureFactorCalculator_sptr;
+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 cc3a36bb6e0..ea21a3a3fe4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
@@ -54,8 +54,7 @@ protected:
CompositeBraggScatterer_sptr m_unitCellScatterers;
};
-typedef boost::shared_ptr<StructureFactorCalculatorSummation>
- StructureFactorSummation_sptr;
+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 24f2452565f..fcbb80c0431 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
@@ -65,7 +65,7 @@ protected:
std::string m_hmSymbol;
};
-typedef boost::shared_ptr<SymmetryElement> SymmetryElement_sptr;
+using SymmetryElement_sptr = boost::shared_ptr<SymmetryElement>;
/** @class SymmetryElementIdentity
@@ -79,7 +79,7 @@ public:
SymmetryElement_sptr clone() const override;
};
-typedef boost::shared_ptr<SymmetryElementIdentity> SymmetryElementIdentity_sptr;
+using SymmetryElementIdentity_sptr = boost::shared_ptr<SymmetryElementIdentity>;
/** @class SymmetryElementInversion
@@ -100,8 +100,7 @@ protected:
V3R m_inversionPoint;
};
-typedef boost::shared_ptr<SymmetryElementInversion>
- SymmetryElementInversion_sptr;
+using SymmetryElementInversion_sptr = boost::shared_ptr<SymmetryElementInversion>;
/** @class SymmetryElementTranslation
@@ -122,8 +121,7 @@ protected:
V3R m_translation;
};
-typedef boost::shared_ptr<SymmetryElementTranslation>
- SymmetryElementTranslation_sptr;
+using SymmetryElementTranslation_sptr = boost::shared_ptr<SymmetryElementTranslation>;
/** @class SymmetryElementWithAxis
@@ -150,7 +148,7 @@ protected:
V3R m_translation;
};
-typedef boost::shared_ptr<SymmetryElementWithAxis> SymmetryElementWithAxis_sptr;
+using SymmetryElementWithAxis_sptr = boost::shared_ptr<SymmetryElementWithAxis>;
/** @class SymmetryElementRotation
@@ -183,7 +181,7 @@ protected:
RotationSense m_rotationSense;
};
-typedef boost::shared_ptr<SymmetryElementRotation> SymmetryElementRotation_sptr;
+using SymmetryElementRotation_sptr = boost::shared_ptr<SymmetryElementRotation>;
/** @class SymmetryElementMirror
@@ -203,7 +201,7 @@ public:
SymmetryElement_sptr clone() const override;
};
-typedef boost::shared_ptr<SymmetryElementMirror> SymmetryElementMirror_sptr;
+using SymmetryElementMirror_sptr = boost::shared_ptr<SymmetryElementMirror>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
index b0e3c5c1195..5d764b1ee2e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
@@ -41,8 +41,7 @@ public:
virtual bool canProcess(const SymmetryOperation &operation) const = 0;
};
-typedef boost::shared_ptr<AbstractSymmetryElementGenerator>
- AbstractSymmetryElementGenerator_sptr;
+using AbstractSymmetryElementGenerator_sptr = boost::shared_ptr<AbstractSymmetryElementGenerator>;
/** @class SymmetryElementIdentityGenerator
@@ -258,8 +257,7 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<SymmetryElementFactoryImpl>;
};
-typedef Mantid::Kernel::SingletonHolder<SymmetryElementFactoryImpl>
- SymmetryElementFactory;
+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 e9fa3cb12de..ce5f4451ac5 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
@@ -78,8 +78,7 @@ private:
SymmetryOperationFactoryImpl();
};
-typedef Mantid::Kernel::SingletonHolder<SymmetryOperationFactoryImpl>
- SymmetryOperationFactory;
+using SymmetryOperationFactory = Mantid::Kernel::SingletonHolder<SymmetryOperationFactoryImpl>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.h b/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.h
index 3b794970e9a..abd1a45938b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/V3R.h
@@ -47,7 +47,7 @@ namespace Geometry {
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-typedef boost::rational<int> RationalNumber;
+using RationalNumber = boost::rational<int>;
class MANTID_GEOMETRY_DLL V3R {
public:
diff --git a/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h b/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
index 63684d264f8..bd7af1c70f9 100644
--- a/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
@@ -95,9 +95,9 @@ private:
};
/// Shared pointer to a ICompAssembly
-typedef boost::shared_ptr<ICompAssembly> ICompAssembly_sptr;
+using ICompAssembly_sptr = boost::shared_ptr<ICompAssembly>;
/// Shared pointer to a const ICompAssembly
-typedef boost::shared_ptr<const ICompAssembly> ICompAssembly_const_sptr;
+using ICompAssembly_const_sptr = boost::shared_ptr<const ICompAssembly>;
} // Namespace Geometry
} // Namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/IComponent.h b/Framework/Geometry/inc/MantidGeometry/IComponent.h
index 251abc2d4ff..25b3bbc9cfa 100644
--- a/Framework/Geometry/inc/MantidGeometry/IComponent.h
+++ b/Framework/Geometry/inc/MantidGeometry/IComponent.h
@@ -25,7 +25,7 @@ class IComponent;
class ParameterMap;
/// Define a type for a unique component identifier.
-typedef IComponent *ComponentID;
+using ComponentID = IComponent *;
/** @class IComponent
@brief base class for Geometric IComponent
@@ -186,9 +186,9 @@ public:
};
/// Typedef of a shared pointer to a IComponent
-typedef boost::shared_ptr<IComponent> IComponent_sptr;
+using IComponent_sptr = boost::shared_ptr<IComponent>;
/// Typdef of a shared pointer to a const IComponent
-typedef boost::shared_ptr<const IComponent> IComponent_const_sptr;
+using IComponent_const_sptr = boost::shared_ptr<const IComponent>;
} // Namespace Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/IDTypes.h b/Framework/Geometry/inc/MantidGeometry/IDTypes.h
index 45d54a1a702..c6d38b6be08 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDTypes.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDTypes.h
@@ -8,10 +8,10 @@
namespace Mantid {
/// Typedef for a spectrum Number
-typedef int32_t specnum_t;
+using specnum_t = int32_t;
/// Typedef for a detector ID
-typedef int32_t detid_t;
+using detid_t = int32_t;
}
#endif // MANTID_GEOMETRY_IDTYPES_H_
diff --git a/Framework/Geometry/inc/MantidGeometry/IDetector.h b/Framework/Geometry/inc/MantidGeometry/IDetector.h
index 078f1870938..9aa29c98252 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDetector.h
@@ -115,10 +115,9 @@ public:
};
/// Shared pointer to IDetector
-typedef boost::shared_ptr<Mantid::Geometry::IDetector> IDetector_sptr;
+using IDetector_sptr = boost::shared_ptr<Mantid::Geometry::IDetector>;
/// Shared pointer to IDetector (const version)
-typedef boost::shared_ptr<const Mantid::Geometry::IDetector>
- IDetector_const_sptr;
+using IDetector_const_sptr = boost::shared_ptr<const Mantid::Geometry::IDetector>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/IObjComponent.h b/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
index 8cafbd21fb1..d5a239686bd 100644
--- a/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
+++ b/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
@@ -120,9 +120,9 @@ private:
};
/// Shared pointer to IObjComponent
-typedef boost::shared_ptr<IObjComponent> IObjComponent_sptr;
+using IObjComponent_sptr = boost::shared_ptr<IObjComponent>;
/// Shared pointer to IObjComponent (const version)
-typedef boost::shared_ptr<const IObjComponent> IObjComponent_const_sptr;
+using IObjComponent_const_sptr = boost::shared_ptr<const IObjComponent>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Framework/Geometry/inc/MantidGeometry/Instrument.h
index 82c605c140a..c786b5abec2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument.h
@@ -17,7 +17,7 @@
namespace Mantid {
/// Typedef of a map from detector ID to detector shared pointer.
-typedef std::map<detid_t, Geometry::IDetector_const_sptr> detid2det_map;
+using detid2det_map = std::map<detid_t, Geometry::IDetector_const_sptr>;
namespace Geometry {
class ComponentInfo;
@@ -26,9 +26,7 @@ class XMLInstrumentParameter;
class ParameterMap;
class ReferenceFrame;
/// Convenience typedef
-typedef std::map<std::pair<std::string, const IComponent *>,
- boost::shared_ptr<XMLInstrumentParameter>>
- InstrumentParameterCache;
+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 41169e9142b..cfeb0f6342a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
@@ -47,9 +47,8 @@ namespace Geometry {
class MANTID_GEOMETRY_DLL CompAssembly : public ICompAssembly,
public Component {
protected:
- typedef std::vector<IComponent *>::iterator comp_it; ///< Iterator type
- typedef std::vector<IComponent *>::const_iterator
- const_comp_it; ///< Const iterator type
+ using comp_it = std::vector<IComponent *>::iterator; ///< 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/Container.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Container.h
index bcb6b982222..e3a2e8b85c6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Container.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Container.h
@@ -39,7 +39,7 @@ namespace Geometry {
*/
class MANTID_GEOMETRY_DLL Container final : public IObject {
public:
- typedef std::unordered_map<std::string, double> ShapeArgs;
+ using ShapeArgs = std::unordered_map<std::string, double>;
Container();
Container(IObject_sptr shape);
@@ -126,9 +126,9 @@ private:
};
/// Typdef for a shared pointer
-typedef boost::shared_ptr<Container> Container_sptr;
+using Container_sptr = boost::shared_ptr<Container>;
/// Typdef for a shared pointer to a const object
-typedef boost::shared_ptr<const Container> Container_const_sptr;
+using Container_const_sptr = boost::shared_ptr<const Container>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
index 21a8388e103..32ab21ebbd6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
@@ -190,7 +190,7 @@ protected:
/// The type of collection used for the detectors
/// - a map of detector pointers with the detector ID as the key
// May want to change this to a hash_map in due course
- typedef std::map<int, IDetector_const_sptr> DetCollection;
+ using DetCollection = std::map<int, IDetector_const_sptr>;
/// The collection of grouped detectors
DetCollection m_detectors;
/** the parameter describes the topology of the detector's group namely if
@@ -263,9 +263,9 @@ private:
};
/// Typedef for shared pointer
-typedef boost::shared_ptr<DetectorGroup> DetectorGroup_sptr;
+using DetectorGroup_sptr = boost::shared_ptr<DetectorGroup>;
/// Typedef for shared pointer to a const object
-typedef boost::shared_ptr<const DetectorGroup> DetectorGroup_const_sptr;
+using DetectorGroup_const_sptr = boost::shared_ptr<const DetectorGroup>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h b/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
index 7f066b14efe..bcb33a9e17d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
@@ -112,8 +112,8 @@ public:
bool exists() const override { return false; }
};
-typedef boost::shared_ptr<AbstractIDFObject> IDFObject_sptr;
-typedef boost::shared_ptr<const AbstractIDFObject> IDFObject_const_sptr;
+using IDFObject_sptr = boost::shared_ptr<AbstractIDFObject>;
+using IDFObject_const_sptr = boost::shared_ptr<const AbstractIDFObject>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
index f8e055ce25c..c301aca85d8 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
@@ -45,9 +45,8 @@ namespace Geometry {
*/
class MANTID_GEOMETRY_DLL ObjCompAssembly : public virtual ICompAssembly,
public virtual ObjComponent {
- typedef std::vector<ObjComponent *>::iterator comp_it; ///< Iterator type
- typedef std::vector<ObjComponent *>::const_iterator
- const_comp_it; ///< Const iterator type
+ using comp_it = std::vector<ObjComponent *>::iterator; ///< 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"; }
@@ -114,9 +113,9 @@ private:
};
/// Shared pointer to ObjCompAssembly
-typedef boost::shared_ptr<ObjCompAssembly> ObjCompAssembly_sptr;
+using ObjCompAssembly_sptr = boost::shared_ptr<ObjCompAssembly>;
/// Shared pointer to ObjCompAssembly (const version)
-typedef boost::shared_ptr<const ObjCompAssembly> ObjCompAssembly_const_sptr;
+using ObjCompAssembly_const_sptr = boost::shared_ptr<const ObjCompAssembly>;
MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &,
const ObjCompAssembly &);
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
index 18c9254403b..ad07be97ef7 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
@@ -219,7 +219,7 @@ ParameterType<Type> &ParameterType<Type>::operator=(const Type &value) {
}
/// Typedef for the shared pointer
-typedef boost::shared_ptr<Parameter> Parameter_sptr;
+using Parameter_sptr = boost::shared_ptr<Parameter>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
index 68738d6152c..12385412020 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterFactory.h
@@ -67,8 +67,8 @@ private:
ParameterFactory &operator=(const ParameterFactory &);
/// A typedef for the instantiator
- typedef Kernel::AbstractInstantiator<Parameter> AbstractFactory;
- typedef std::map<std::string, std::unique_ptr<AbstractFactory>> FactoryMap;
+ using AbstractFactory = Kernel::AbstractInstantiator<Parameter>;
+ 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 13f7ebc2b72..4d2120d4c5b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
@@ -54,23 +54,17 @@ class Instrument;
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
/// Parameter map iterator typedef
-typedef tbb::concurrent_unordered_multimap<
- ComponentID, boost::shared_ptr<Parameter>>::iterator component_map_it;
-typedef tbb::concurrent_unordered_multimap<
- ComponentID, boost::shared_ptr<Parameter>>::const_iterator
- component_map_cit;
+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
- typedef tbb::concurrent_unordered_multimap<ComponentID,
- boost::shared_ptr<Parameter>> pmap;
+ using pmap = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >;
/// Parameter map iterator typedef
- typedef tbb::concurrent_unordered_multimap<
- ComponentID, boost::shared_ptr<Parameter>>::iterator pmap_it;
+ using pmap_it = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >::iterator;
/// Parameter map iterator typedef
- typedef tbb::concurrent_unordered_multimap<
- ComponentID, boost::shared_ptr<Parameter>>::const_iterator pmap_cit;
+ using pmap_cit = tbb::concurrent_unordered_multimap<ComponentID, boost::shared_ptr<Parameter> >::const_iterator;
/// Default constructor
ParameterMap();
/// Const constructor
@@ -388,9 +382,9 @@ private:
};
/// ParameterMap shared pointer typedef
-typedef boost::shared_ptr<ParameterMap> ParameterMap_sptr;
+using ParameterMap_sptr = boost::shared_ptr<ParameterMap>;
/// ParameterMap constant shared pointer typedef
-typedef boost::shared_ptr<const ParameterMap> ParameterMap_const_sptr;
+using ParameterMap_const_sptr = boost::shared_ptr<const ParameterMap>;
} // Namespace Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
index bdf087392e8..5033068f3ac 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
@@ -211,9 +211,8 @@ private:
MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &,
const RectangularDetector &);
-typedef boost::shared_ptr<RectangularDetector> RectangularDetector_sptr;
-typedef boost::shared_ptr<const RectangularDetector>
- RectangularDetector_const_sptr;
+using RectangularDetector_sptr = boost::shared_ptr<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 428afb7c657..ce1b5f4fad1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/StructuredDetector.h
@@ -192,9 +192,8 @@ private:
MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &,
const StructuredDetector &);
-typedef boost::shared_ptr<StructuredDetector> StructuredDetector_sptr;
-typedef boost::shared_ptr<const StructuredDetector>
- StructuredDetector_const_sptr;
+using StructuredDetector_sptr = boost::shared_ptr<StructuredDetector>;
+using StructuredDetector_const_sptr = boost::shared_ptr<const StructuredDetector>;
} // namespace Geometry
} // namespace Mantid
#endif // STRUCTUREDDETECTOR_H
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.h b/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.h
index e5272b713fc..64ee5ae4b3a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument_fwd.h
@@ -34,13 +34,13 @@ namespace Geometry {
class Instrument;
/// Shared pointer to an instrument object
-typedef boost::shared_ptr<Instrument> Instrument_sptr;
+using Instrument_sptr = boost::shared_ptr<Instrument>;
/// Shared pointer to an const instrument object
-typedef boost::shared_ptr<const Instrument> Instrument_const_sptr;
+using Instrument_const_sptr = boost::shared_ptr<const Instrument>;
/// unique pointer to an instrument
-typedef std::unique_ptr<Instrument> Instrument_uptr;
+using Instrument_uptr = std::unique_ptr<Instrument>;
/// unique pointer to an instrument (const version)
-typedef std::unique_ptr<const Instrument> Instrument_const_uptr;
+using Instrument_const_uptr = std::unique_ptr<const Instrument>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
index 49819de15c9..1c0c7a16cdc 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
@@ -63,8 +63,7 @@ public:
protected:
std::vector<Mantid::Geometry::MDImplicitFunction_sptr> m_Functions;
- typedef std::vector<Mantid::Geometry::MDImplicitFunction_sptr>::const_iterator
- FunctionIterator;
+ using FunctionIterator = std::vector<Mantid::Geometry::MDImplicitFunction_sptr>::const_iterator;
};
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
index 5ed0c0e6278..0f3980196e7 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
@@ -117,14 +117,14 @@ public:
};
/// Shared Pointer for IMDDimension. Frequently used type in framework.
-typedef boost::shared_ptr<IMDDimension> IMDDimension_sptr;
+using IMDDimension_sptr = boost::shared_ptr<IMDDimension>;
/// Shared Pointer to const IMDDimension. Not strictly necessary since
/// IMDDimension is pure abstract.
-typedef boost::shared_ptr<const IMDDimension> IMDDimension_const_sptr;
+using IMDDimension_const_sptr = boost::shared_ptr<const IMDDimension>;
/// Vector of constant shared pointers to IMDDimensions.
-typedef std::vector<IMDDimension_const_sptr> VecIMDDimension_const_sptr;
+using VecIMDDimension_const_sptr = std::vector<IMDDimension_const_sptr>;
/// Vector of shared pointers to IMDDimensions.
-typedef std::vector<IMDDimension_sptr> VecIMDDimension_sptr;
+using VecIMDDimension_sptr = std::vector<IMDDimension_sptr>;
}
}
#endif
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
index 29152ae5a55..799e5261a66 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
@@ -50,10 +50,10 @@ public:
virtual ~MDFrame() = default;
};
-typedef std::unique_ptr<MDFrame> MDFrame_uptr;
-typedef std::unique_ptr<const MDFrame> MDFrame_const_uptr;
-typedef std::shared_ptr<MDFrame> MDFrame_sptr;
-typedef std::shared_ptr<const MDFrame> MDFrame_const_sptr;
+using MDFrame_uptr = std::unique_ptr<MDFrame>;
+using MDFrame_const_uptr = std::unique_ptr<const MDFrame>;
+using MDFrame_sptr = std::shared_ptr<MDFrame>;
+using MDFrame_const_sptr = std::shared_ptr<const MDFrame>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
index f702e0e9ce8..13aa7104ffa 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
@@ -54,7 +54,7 @@ class MANTID_GEOMETRY_DLL MDFrameFactory
MDFrameArgument> {};
/// Helper typedef
-typedef std::unique_ptr<MDFrameFactory> MDFrameFactory_uptr;
+using MDFrameFactory_uptr = std::unique_ptr<MDFrameFactory>;
//-----------------------------------------------------------------------
// Derived MDFrameFactory declarations
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
index 40753107697..0b9b680a10f 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
@@ -95,7 +95,7 @@ public:
bool hasIntegratedTDimension() const;
private:
- typedef std::vector<IMDDimension_const_sptr> DimensionContainerType;
+ using DimensionContainerType = std::vector<IMDDimension_const_sptr>;
mutable DimensionContainerType m_vecDimensions;
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
index 79e1381b811..a4b16a6b7c7 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
@@ -147,10 +147,10 @@ private:
};
/// Shared pointer to a MDHistoDimension
-typedef boost::shared_ptr<MDHistoDimension> MDHistoDimension_sptr;
+using MDHistoDimension_sptr = boost::shared_ptr<MDHistoDimension>;
/// Shared pointer to a const MDHistoDimension
-typedef boost::shared_ptr<const MDHistoDimension> MDHistoDimension_const_sptr;
+using MDHistoDimension_const_sptr = boost::shared_ptr<const MDHistoDimension>;
} // namespace Mantid
} // namespace Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h
index e4fcc69ce53..dba70558823 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h
@@ -79,7 +79,7 @@ private:
};
/// Handy typedef for collection of builders.
-typedef std::vector<MDHistoDimensionBuilder> Vec_MDHistoDimensionBuilder;
+using Vec_MDHistoDimensionBuilder = std::vector<MDHistoDimensionBuilder>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
index a94e881bc2b..b7c4faf5f4d 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
@@ -294,7 +294,7 @@ protected:
size_t m_numPlanes;
};
-typedef boost::shared_ptr<MDImplicitFunction> MDImplicitFunction_sptr;
+using MDImplicitFunction_sptr = boost::shared_ptr<MDImplicitFunction>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.h
index 84983b49ca7..b75542c177f 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDTypes.h
@@ -40,7 +40,7 @@ namespace Mantid {
* We can change this in order to compare
* performance/memory/accuracy requirements.
*/
-typedef float coord_t;
+using coord_t = float;
/// Define indicating that the coord_t type is a float (not double)
//#undef COORDT_IS_FLOAT
@@ -49,7 +49,7 @@ typedef float coord_t;
/** Typedef for the signal recorded in a MDBox, etc.
* Note: MDEvents use 'float' internally to save memory
*/
-typedef double signal_t;
+using signal_t = double;
/** Macro TMDE to make declaring template functions
* faster. Put this macro before function declarations.
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h b/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
index f1b0a16b005..8b808c01926 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
@@ -218,9 +218,9 @@ private:
};
/// A shared pointer to a BoundingBox
-typedef boost::shared_ptr<BoundingBox> BoundingBox_sptr;
+using BoundingBox_sptr = boost::shared_ptr<BoundingBox>;
/// A shared pointer to a const BoundingBox
-typedef boost::shared_ptr<const BoundingBox> BoundingBox_const_sptr;
+using BoundingBox_const_sptr = boost::shared_ptr<const BoundingBox>;
/// Print out the bounding box values to a stream.
MANTID_GEOMETRY_DLL std::ostream &operator<<(std::ostream &os,
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h b/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
index 24331e80752..11e92711d70 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/IObject.h
@@ -103,13 +103,13 @@ public:
};
/// Typdef for a shared pointer
-typedef boost::shared_ptr<IObject> IObject_sptr;
+using IObject_sptr = boost::shared_ptr<IObject>;
/// Typdef for a shared pointer to a const object
-typedef boost::shared_ptr<const IObject> IObject_const_sptr;
+using IObject_const_sptr = boost::shared_ptr<const IObject>;
/// Typdef for a unique pointer
-typedef std::unique_ptr<IObject> IObject_uptr;
+using IObject_uptr = std::unique_ptr<IObject>;
/// Typdef for a unique pointer to a const object
-typedef std::unique_ptr<const IObject> IObject_const_uptr;
+using IObject_const_uptr = std::unique_ptr<const IObject>;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h b/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
index ef45f935d61..ad1110e26bc 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
@@ -19,7 +19,7 @@ class IComponent;
struct Link;
class Track;
/// Typedef for object intersections
-typedef Track::LType Links;
+using Links = Track::LType;
/**
This class is responsible for tracking rays and accumulating a list of objects
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
index c6b87cc774c..87a1023e55c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
@@ -42,8 +42,7 @@ 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
- typedef std::vector<std::pair<std::string, std::unique_ptr<Surface>>>
- MapType; ///< 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/FitParameter.cpp b/Framework/Geometry/src/Instrument/FitParameter.cpp
index 196afb8cadb..55be129701d 100644
--- a/Framework/Geometry/src/Instrument/FitParameter.cpp
+++ b/Framework/Geometry/src/Instrument/FitParameter.cpp
@@ -160,7 +160,7 @@ std::ostream &operator<<(std::ostream &os, const FitParameter &f) {
*/
std::istream &operator>>(std::istream &in, FitParameter &f) {
- typedef Mantid::Kernel::StringTokenizer tokenizer;
+ using tokenizer = Mantid::Kernel::StringTokenizer;
std::string str;
getline(in, str);
diff --git a/Framework/Geometry/src/Instrument/SampleEnvironmentSpecParser.cpp b/Framework/Geometry/src/Instrument/SampleEnvironmentSpecParser.cpp
index 36daa0b05ce..441989fcdca 100644
--- a/Framework/Geometry/src/Instrument/SampleEnvironmentSpecParser.cpp
+++ b/Framework/Geometry/src/Instrument/SampleEnvironmentSpecParser.cpp
@@ -50,7 +50,7 @@ namespace Geometry {
SampleEnvironmentSpec_uptr
SampleEnvironmentSpecParser::parse(const std::string &name,
std::istream &istr) {
- typedef AutoPtr<Document> DocumentPtr;
+ using DocumentPtr = AutoPtr<Document>;
InputSource src(istr);
DOMParser parser;
diff --git a/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp b/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp
index 317b8056141..6378c827da7 100644
--- a/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp
+++ b/Framework/Geometry/src/Instrument/XMLInstrumentParameter.cpp
@@ -117,8 +117,7 @@ double XMLInstrumentParameter::createParamValue(
if (!m_logfileID.empty()) {
// get value from time series
- typedef std::map<std::string, Kernel::Math::StatisticType>
- StatisticsMapType;
+ 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/src/Math/mathSupport.cpp b/Framework/Geometry/src/Math/mathSupport.cpp
index e662bf7f446..69ad25b1df9 100644
--- a/Framework/Geometry/src/Math/mathSupport.cpp
+++ b/Framework/Geometry/src/Math/mathSupport.cpp
@@ -65,7 +65,7 @@ int solveCubic(const CInputIter Coef, std::complex<double> &AnsA,
*/
{
- typedef std::complex<double> Cpair;
+ using Cpair = std::complex<double>;
double q, r; /* solution parameters */
double termR, discrim;
double r13;
diff --git a/Framework/Geometry/test/CSGObjectTest.h b/Framework/Geometry/test/CSGObjectTest.h
index bf96ea743aa..e9b79fdd159 100644
--- a/Framework/Geometry/test/CSGObjectTest.h
+++ b/Framework/Geometry/test/CSGObjectTest.h
@@ -1147,7 +1147,7 @@ public:
private:
/// Surface type
- typedef std::map<int, boost::shared_ptr<Surface>> STYPE;
+ 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;
@@ -1240,7 +1240,7 @@ private:
// PLANE SURFACES:
- typedef std::pair<int, std::string> SCompT;
+ using SCompT = std::pair<int, std::string>;
std::vector<SCompT> SurfLine;
if (desired.find("60001") != std::string::npos)
SurfLine.push_back(SCompT(60001, "px -1"));
diff --git a/Framework/Geometry/test/MDBoxImplicitFunctionTest.h b/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
index e27544409c8..38c8ea2c8ff 100644
--- a/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
+++ b/Framework/Geometry/test/MDBoxImplicitFunctionTest.h
@@ -11,7 +11,7 @@ using namespace Mantid;
using namespace Mantid::Geometry;
namespace {
-typedef boost::tuple<Mantid::coord_t, Mantid::coord_t> Extent;
+using Extent = boost::tuple<Mantid::coord_t, Mantid::coord_t>;
}
class MDBoxImplicitFunctionTest : public CxxTest::TestSuite {
diff --git a/Framework/Geometry/test/MatrixVectorPairTest.h b/Framework/Geometry/test/MatrixVectorPairTest.h
index 5cd14110346..160907e874b 100644
--- a/Framework/Geometry/test/MatrixVectorPairTest.h
+++ b/Framework/Geometry/test/MatrixVectorPairTest.h
@@ -10,7 +10,7 @@
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
-typedef MatrixVectorPair<int, V3R> V3RIntPair;
+using V3RIntPair = MatrixVectorPair<int, V3R>;
class MatrixVectorPairTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/Geometry/test/ParameterMapTest.h b/Framework/Geometry/test/ParameterMapTest.h
index c9da12fe965..f9c03f4d78a 100644
--- a/Framework/Geometry/test/ParameterMapTest.h
+++ b/Framework/Geometry/test/ParameterMapTest.h
@@ -304,9 +304,7 @@ public:
test_Replacing_Existing_Parameter_On_A_Copy_Does_Not_Update_Original_Value_Using_AddHelpers_As_Strings() {
// -- Specialized Helper Functions --
- typedef boost::function<void(ParameterMap *, const IComponent *,
- const std::string &, const std::string &,
- const std::string *const)> AddFuncHelper;
+ 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/Geometry/test/PeakTransformSelectorTest.h b/Framework/Geometry/test/PeakTransformSelectorTest.h
index c2a1f2b7649..ac3c438324c 100644
--- a/Framework/Geometry/test/PeakTransformSelectorTest.h
+++ b/Framework/Geometry/test/PeakTransformSelectorTest.h
@@ -31,9 +31,9 @@ private:
GCC_DIAG_ON_SUGGEST_OVERRIDE
};
- typedef MockPeakTransformFactoryType<0> MockPeakTransformFactory;
- typedef MockPeakTransformFactoryType<0> MockPeakTransformFactoryA;
- typedef MockPeakTransformFactoryType<1> MockPeakTransformFactoryB;
+ using MockPeakTransformFactory = MockPeakTransformFactoryType<0>;
+ using MockPeakTransformFactoryA = MockPeakTransformFactoryType<0>;
+ using MockPeakTransformFactoryB = MockPeakTransformFactoryType<1>;
public:
void test_Constructor() {
diff --git a/Framework/Geometry/test/XMLInstrumentParameterTest.h b/Framework/Geometry/test/XMLInstrumentParameterTest.h
index b2bfe5cd2bf..ce2ac3c2ceb 100644
--- a/Framework/Geometry/test/XMLInstrumentParameterTest.h
+++ b/Framework/Geometry/test/XMLInstrumentParameterTest.h
@@ -16,7 +16,7 @@ using namespace Mantid::Kernel;
class XMLInstrumentParameterTest : public CxxTest::TestSuite {
private:
- typedef boost::shared_ptr<XMLInstrumentParameter> XMLInstrumentParameter_sptr;
+ using XMLInstrumentParameter_sptr = boost::shared_ptr<XMLInstrumentParameter>;
/**
Construction logic for the XMLInstrumentParameter type isn't great, so this
--
GitLab