From b49f1b2c47a90d56a35e8eddee1263c3274e08ed Mon Sep 17 00:00:00 2001
From: Matthew D Jones <matthew.d.jones@tessella.com>
Date: Tue, 16 Feb 2016 12:32:05 +0000
Subject: [PATCH] Re #15287 Replace multiset with unordered_multiset
---
Framework/Kernel/src/CompositeValidator.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Framework/Kernel/src/CompositeValidator.cpp b/Framework/Kernel/src/CompositeValidator.cpp
index 770bbdc0261..06d35a022ec 100644
--- a/Framework/Kernel/src/CompositeValidator.cpp
+++ b/Framework/Kernel/src/CompositeValidator.cpp
@@ -1,4 +1,5 @@
#include "MantidKernel/CompositeValidator.h"
+#include <unordered_set>
using namespace Mantid::Kernel;
@@ -11,13 +12,13 @@ CompositeValidator::CompositeValidator() : IValidator(), m_children() {}
CompositeValidator::~CompositeValidator() { m_children.clear(); }
/**
- * The allowed values for the composite vaidator. This returns
+ * The allowed values for the composite validator. This returns
* the intersection of the allowedValues for the child validators
* @return
*/
std::vector<std::string> CompositeValidator::allowedValues() const {
std::set<std::string> elem_unique;
- std::multiset<std::string> elem_all;
+ std::unordered_multiset<std::string> elem_all;
// how many validators return non-empty list of allowed values
int n_combinations(0);
for (const auto &itr : m_children) {
--
GitLab