From eaa788b8f016da7beae9cb88cf5f889157dc154d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 25 Mar 2020 17:03:12 +0000 Subject: [PATCH] replace qBinaryFindHelper() with its body Signed-off-by: Ivailo Monev --- src/core/tools/qalgorithms.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/core/tools/qalgorithms.h b/src/core/tools/qalgorithms.h index ca23354ec..67ff52f1b 100644 --- a/src/core/tools/qalgorithms.h +++ b/src/core/tools/qalgorithms.h @@ -194,17 +194,6 @@ inline typename Container::const_iterator qUpperBound(const Container &container return std::upper_bound(container.constBegin(), container.constEnd(), value, qLess()); } -template -inline RandomAccessIterator qBinaryFindHelper(RandomAccessIterator begin, RandomAccessIterator end, const T &value, LessThan lessThan) -{ - RandomAccessIterator it = qLowerBound(begin, end, value, lessThan); - - if (it == end || lessThan(value, *it)) - return end; - - return it; -} - template inline RandomAccessIterator qBinaryFind(RandomAccessIterator begin, RandomAccessIterator end, const T &value) { @@ -219,13 +208,18 @@ inline RandomAccessIterator qBinaryFind(RandomAccessIterator begin, RandomAccess template inline RandomAccessIterator qBinaryFind(RandomAccessIterator begin, RandomAccessIterator end, const T &value, LessThan lessThan) { - return qBinaryFindHelper(begin, end, value, lessThan); + RandomAccessIterator it = qLowerBound(begin, end, value, lessThan); + + if (it == end || lessThan(value, *it)) + return end; + + return it; } template inline typename Container::const_iterator qBinaryFind(const Container &container, const T &value) { - return qBinaryFindHelper(container.constBegin(), container.constEnd(), value, qLess()); + return qBinaryFind(container.constBegin(), container.constEnd(), value, qLess()); } template -- 2.11.0