Merge remote-tracking branch 'origin/4.14'

Change-Id: I42000e1ceca42f97c4e512505161151ab7369cd0
This commit is contained in:
Eike Ziller
2021-02-18 14:16:04 +01:00

View File

@@ -451,7 +451,8 @@ private:
template<typename Container, int... ColumnIndices> template<typename Container, int... ColumnIndices>
void pushBackToContainer(Container &container, std::integer_sequence<int, ColumnIndices...>) void pushBackToContainer(Container &container, std::integer_sequence<int, ColumnIndices...>)
{ {
container.push_back(Container::value_type(ValueGetter(*this, ColumnIndices)...)); using Type = typename Container::value_type;
container.push_back(Type(ValueGetter(*this, ColumnIndices)...));
} }
template<int ResultTypeCount, typename Container> template<int ResultTypeCount, typename Container>