flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed buggy CSequence::sortBy when sorting by multiple members.

Browse Source 
Implementation of Predicates::MemberLess was wrong, so replaced it with a
simpler one. Also added a regression test and removed unused code.
This commit is contained in:
Mat Sutcliffe
2018-11-30 15:50:52 +00:00
committed by Klaus Basan
parent f2bd767c63
commit 8a058202ed
3 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/blackmisc/algorithm.h
View File

@@ -144,17 +144,6 @@ namespace BlackMisc
namespace Private
{
//! \private
template <typename T, typename F, size_t... Is>
void tupleForEachImpl(T &&tuple, F &&visitor, std::index_sequence<Is...>)
{
// parameter pack swallow idiom
static_cast<void>(std::initializer_list<int>
{
//! \fixme C-style cast is needed due to a clang bug: https://bugs.llvm.org/show_bug.cgi?id=39375
((void)(std::forward<F>(visitor)(std::get<Is>(std::forward<T>(tuple)))), 0)...
});
}
//! \private
template <typename T, typename F, size_t... Is>
void tupleForEachPairImpl(T &&tuple, F &&visitor, std::index_sequence<Is...>)
@@ -168,16 +157,6 @@ namespace BlackMisc
}
}
/*!
* Invoke a visitor function on each element of a tuple in order.
*/
template <typename T, typename F>
void tupleForEach(T &&tuple, F &&visitor)
{
using seq = std::make_index_sequence<std::tuple_size<std::decay_t<T>>::value>;
return Private::tupleForEachImpl(std::forward<T>(tuple), std::forward<F>(visitor), seq());
}
/*!
* Invoke a visitor function on each pair of elements of a tuple in order.
*/

14
src/blackmisc/predicates.h
View File

@@ -62,15 +62,7 @@ namespace BlackMisc
{
return [vs...](const auto &a, const auto &b)
{
bool less = true;
bool greater = false;
tupleForEach(std::make_tuple(vs...), [ & ](auto member)
{
less = less && ! greater && (a.*member)() < (b.*member)();
greater = (b.*member)() < (a.*member)();
});
Q_UNUSED(greater); // CPP style check
return less;
return std::forward_as_tuple((a.*vs)()...) < std::forward_as_tuple((b.*vs)()...);
};
}
@@ -119,9 +111,7 @@ namespace BlackMisc
{
return [vs...](const auto &a, const auto &b)
{
bool equal = true;
tupleForEach(std::make_tuple(vs...), [ & ](auto member) { equal = equal && (a.*member)() == (b.*member)(); });
return equal;
return std::forward_as_tuple((a.*vs)()...) == std::forward_as_tuple((b.*vs)()...);
};
}