diff --git a/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h b/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
index 8f2ee4c75e4458b5bccffd1db5c0d386e2bf0652..e80c0584109c1f92f4f7c111ac2d46e325aa472d 100644
--- a/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
+++ b/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
@@ -4,7 +4,7 @@
#include <vector>
#include <set>
#ifndef Q_MOC_RUN
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#endif
#include "MantidGeometry/IDTypes.h"
@@ -50,7 +50,7 @@ class MatrixWorkspace;
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class MANTID_API_DLL SpectrumDetectorMapping {
- typedef boost::unordered_map<specid_t, std::set<detid_t>> sdmap;
+ typedef std::unordered_map<specid_t, std::set<detid_t>> sdmap;
public:
explicit SpectrumDetectorMapping(const MatrixWorkspace *const workspace,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h b/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h
index 936522c1d930cb015b3abbd2ba9bc320e4d82444..8188ac663a49542c7e003111f53cc7819d2d4c3f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h
@@ -10,7 +10,7 @@
// To be compatible with VSC Express edition that does not have tr1
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace Mantid {
namespace Algorithms {
@@ -69,7 +69,7 @@ private:
/// Returns an allowed values statement to insert into decumentation
std::string allowedValuesStatement(std::vector<std::string> vals);
// Typedef for det to value map
- typedef boost::unordered_map<detid_t, bool> udet2valuem;
+ typedef std::unordered_map<detid_t, bool> udet2valuem;
/// A map of detector numbers to mask boolean
udet2valuem umap;
/// Get the properties
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h b/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
index 824703b06c949bc9f06c88796a7e144852a2ea6b..81115c430ab233007bdc3fae6281a07e18de4e50 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include "MantidAPI/Algorithm.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -98,7 +98,7 @@ public:
private:
/// Map containing the detector entries found in the *.cal file. The key is
/// the udet number, the value of is a pair of <group,selected>.
- typedef boost::unordered_map<int, std::pair<int, int>> calmap;
+ typedef std::unordered_map<int, std::pair<int, int>> calmap;
/// Initialisation code
void init();
/// Execution code
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
index ac575bb8035a120fd8e0e3cc51739cd693b26f2d..11a870adec6328f4dbb98b3bed5fa14c0f64a5d0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
@@ -3,7 +3,7 @@
#include "MantidAPI/Algorithm.h"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace Mantid {
namespace CurveFitting {
@@ -104,7 +104,7 @@ private:
/// Input TOF data
API::MatrixWorkspace_const_sptr m_inputWS;
/// Sorted indices to correct
- boost::unordered_map<size_t, size_t> m_indices;
+ std::unordered_map<size_t, size_t> m_indices;
/// Function that defines the mass profile
std::string m_profileFunction;
/// The number of peaks in spectrum
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h b/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h
index 7cce58d7e4add601818f6c19a33309ea286c714e..710a875b0730537ce9103baf8258bd9a548daf8b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h
@@ -8,7 +8,7 @@
// Boost graphing
#ifndef Q_MOC_RUN
#include <boost/graph/adjacency_list.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp>
#endif
@@ -21,7 +21,7 @@ namespace Geometry {
class Instrument;
class IComponent;
-typedef boost::unordered_map<specid_t, std::set<detid_t>>
+typedef std::unordered_map<specid_t, std::set<detid_t>>
ISpectrumDetectorMapping;
/**
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h b/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h
index 953ba110eebf4f6879020e6bbb1e413cb03ca620..aefd39961e03aa108360c4c2778b3d93a50d712e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h
@@ -93,7 +93,7 @@ private:
/// Vertex descriptor object for Graph
typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
/// map object of int to Graph Vertex descriptor
- typedef boost::unordered_map<specid_t, Vertex> MapIV;
+ typedef std::unordered_map<specid_t, Vertex> MapIV;
/// Construct the graph based on the given number of neighbours and the
/// current instument and spectra-detector mapping
diff --git a/Framework/Geometry/test/NearestNeighboursTest.h b/Framework/Geometry/test/NearestNeighboursTest.h
index bc5edf2e2bfba979fade85e2c20e5a2ca1e212e0..e4d3ad1879a6690f9540100024563dea2a28ada5 100644
--- a/Framework/Geometry/test/NearestNeighboursTest.h
+++ b/Framework/Geometry/test/NearestNeighboursTest.h
@@ -27,7 +27,7 @@ class NearestNeighboursTest : public CxxTest::TestSuite {
public:
static ISpectrumDetectorMapping
buildSpectrumDetectorMapping(const specid_t start, const specid_t end) {
- boost::unordered_map<specid_t, std::set<detid_t>> map;
+ std::unordered_map<specid_t, std::set<detid_t>> map;
for (specid_t i = start; i <= end; ++i) {
map[i].insert(i);
}
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
index d5a3c71fc66da3866275f0cd6a87bf0c4b5050e5..8230143778a7fcabd4081f429b3cf8ffb8fc2fe0 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
@@ -3,7 +3,7 @@
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include "MantidKernel/V3D.h"
#include "MantidKernel/Matrix.h"
@@ -53,9 +53,9 @@ namespace MDAlgorithms {
<http://doxygen.mantidproject.org>
*/
-typedef boost::unordered_map<
+typedef std::unordered_map<
int64_t, std::vector<std::pair<double, Mantid::Kernel::V3D>>> EventListMap;
-typedef boost::unordered_map<int64_t, Mantid::Kernel::V3D> PeakQMap;
+typedef std::unordered_map<int64_t, Mantid::Kernel::V3D> PeakQMap;
class DLLExport Integrate3DEvents {
public: