diff options
author | Treeston <treeston.mmoc@gmail.com> | 2020-03-19 17:18:01 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-12-24 00:37:21 +0100 |
commit | ea0aa63d96cac461dd0b473437f1143898d3c3b5 (patch) | |
tree | 036839443a9df03bdce5df5f55ecd449ba8daf94 /src/common/Utilities/FuzzyFind.h | |
parent | 632609b897c7268bd18997633019dde98dd2e6d6 (diff) |
Core/Misc: C++17 cleanups, commit 2, the advstd commit
(cherry picked from commit 857f8d9231d148d4f2def9c83548b40059923029)
Diffstat (limited to 'src/common/Utilities/FuzzyFind.h')
-rw-r--r-- | src/common/Utilities/FuzzyFind.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/Utilities/FuzzyFind.h b/src/common/Utilities/FuzzyFind.h index ae511456aa3..f907d98592e 100644 --- a/src/common/Utilities/FuzzyFind.h +++ b/src/common/Utilities/FuzzyFind.h @@ -18,7 +18,6 @@ #ifndef TRINITY_FUZZYFIND_H #define TRINITY_FUZZYFIND_H -#include "advstd.h" #include <map> #include <string> @@ -30,7 +29,7 @@ namespace Trinity auto FuzzyFindIn(Container const& container, NeedleContainer const& needles, ContainsOperator const& contains = StringContainsStringI, int(*bonus)(decltype((*std::begin(std::declval<Container>())))) = nullptr) { using IteratorResult = decltype((*std::begin(container))); - using MappedType = std::conditional_t<advstd::is_reference_v<IteratorResult>, std::reference_wrapper<std::remove_reference_t<IteratorResult>>, IteratorResult>; + using MappedType = std::conditional_t<std::is_reference_v<IteratorResult>, std::reference_wrapper<std::remove_reference_t<IteratorResult>>, IteratorResult>; std::multimap<size_t, MappedType, std::greater<size_t>> results; for (auto outerIt = std::begin(container), outerEnd = std::end(container); outerIt != outerEnd; ++outerIt) |