28e194d3b2
The code for deducing the type of output sequence was assuming that the input sequence is always a template class and was trying to use the corresponding container type for the output sequence. Fixed the deduction code, to assume that the output sequence has the same type as the input sequence, when it's not a template class. Also added tests to verify that all QtConcurrent functions support non-template input sequences. Fixes: QTBUG-30617 Pick-to: 6.2 6.1 Change-Id: I486fe99f3207cfff5dcceb3712cc7de863067edb Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
209 lines
4.8 KiB
C++
209 lines
4.8 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
#ifndef FUNCTIONS_H
|
|
#define FUNCTIONS_H
|
|
|
|
#include <QList>
|
|
|
|
#include <vector>
|
|
|
|
bool keepEvenIntegers(const int &x)
|
|
{
|
|
return (x & 1) == 0;
|
|
}
|
|
|
|
class KeepEvenIntegers
|
|
{
|
|
public:
|
|
bool operator()(const int &x)
|
|
{
|
|
return (x & 1) == 0;
|
|
}
|
|
};
|
|
|
|
class KeepEvenIntegersMoveOnly
|
|
{
|
|
public:
|
|
KeepEvenIntegersMoveOnly() = default;
|
|
KeepEvenIntegersMoveOnly(KeepEvenIntegersMoveOnly &&) = default;
|
|
KeepEvenIntegersMoveOnly &operator=(KeepEvenIntegersMoveOnly &&other) = default;
|
|
|
|
KeepEvenIntegersMoveOnly(const KeepEvenIntegersMoveOnly &) = delete;
|
|
KeepEvenIntegersMoveOnly &operator=(const KeepEvenIntegersMoveOnly &) = delete;
|
|
|
|
bool operator()(int x) { return (x & 1) == 0; }
|
|
};
|
|
|
|
class Number
|
|
{
|
|
int n;
|
|
|
|
public:
|
|
Number()
|
|
: n(0)
|
|
{ }
|
|
|
|
Number(int n)
|
|
: n(n)
|
|
{ }
|
|
|
|
void multiplyBy2()
|
|
{
|
|
n *= 2;
|
|
}
|
|
|
|
Number multipliedBy2() const
|
|
{
|
|
return n * 2;
|
|
}
|
|
|
|
bool isEven() const
|
|
{
|
|
return (n & 1) == 0;
|
|
}
|
|
|
|
int toInt() const
|
|
{
|
|
return n;
|
|
}
|
|
|
|
QString toString() const
|
|
{
|
|
return QString::number(n);
|
|
}
|
|
|
|
Number squared() const
|
|
{
|
|
return Number(n * n);
|
|
}
|
|
|
|
bool operator==(const Number &other) const
|
|
{
|
|
return n == other.n;
|
|
}
|
|
};
|
|
|
|
bool keepEvenNumbers(const Number &x)
|
|
{
|
|
return (x.toInt() & 1) == 0;
|
|
}
|
|
|
|
class KeepEvenNumbers
|
|
{
|
|
public:
|
|
bool operator()(const Number &x)
|
|
{
|
|
return (x.toInt() & 1) == 0;
|
|
}
|
|
};
|
|
|
|
void intSumReduce(int &sum, int x)
|
|
{
|
|
sum += x;
|
|
}
|
|
|
|
class IntSumReduce
|
|
{
|
|
public:
|
|
void operator()(int &sum, int x)
|
|
{
|
|
sum += x;
|
|
}
|
|
};
|
|
|
|
class IntSumReduceMoveOnly
|
|
{
|
|
public:
|
|
IntSumReduceMoveOnly() = default;
|
|
IntSumReduceMoveOnly(IntSumReduceMoveOnly &&) = default;
|
|
IntSumReduceMoveOnly &operator=(IntSumReduceMoveOnly &&other) = default;
|
|
|
|
IntSumReduceMoveOnly(const IntSumReduceMoveOnly &) = delete;
|
|
IntSumReduceMoveOnly &operator=(const IntSumReduceMoveOnly &) = delete;
|
|
|
|
void operator()(int &sum, int x) { sum += x; }
|
|
};
|
|
|
|
void numberSumReduce(int &sum, const Number &x)
|
|
{
|
|
sum += x.toInt();
|
|
}
|
|
|
|
class NumberSumReduce
|
|
{
|
|
public:
|
|
void operator()(int &sum, const Number &x)
|
|
{
|
|
sum += x.toInt();
|
|
}
|
|
};
|
|
|
|
template<typename T>
|
|
class MoveOnlyVector
|
|
{
|
|
public:
|
|
using value_type = T;
|
|
|
|
// rule of six
|
|
MoveOnlyVector() = default;
|
|
~MoveOnlyVector() = default;
|
|
MoveOnlyVector(MoveOnlyVector<T> &&other) = default;
|
|
MoveOnlyVector &operator=(MoveOnlyVector<T> &&other) = default;
|
|
|
|
MoveOnlyVector(const MoveOnlyVector<T> &) = delete;
|
|
MoveOnlyVector &operator=(const MoveOnlyVector<T> &) = delete;
|
|
|
|
// convenience for creation
|
|
explicit MoveOnlyVector(const std::vector<T> &v) : data(v) { }
|
|
void push_back(T &&el) { data.push_back(el); }
|
|
void push_back(const T &el) { data.push_back(el); }
|
|
|
|
// minimal interface to be usable as a Sequence in QtConcurrent
|
|
typedef typename std::vector<T>::const_iterator const_iterator;
|
|
typedef typename std::vector<T>::iterator iterator;
|
|
const_iterator cbegin() const { return data.cbegin(); }
|
|
const_iterator cend() const { return data.cend(); }
|
|
iterator begin() { return data.begin(); }
|
|
iterator end() { return data.end(); }
|
|
const_iterator begin() const { return data.cbegin(); }
|
|
const_iterator end() const { return data.cend(); }
|
|
bool operator==(const MoveOnlyVector<T> &other) const { return data == other.data; }
|
|
|
|
private:
|
|
std::vector<T> data;
|
|
};
|
|
|
|
struct NonTemplateSequence : public QList<int>
|
|
{
|
|
NonTemplateSequence() = default;
|
|
|
|
NonTemplateSequence(std::initializer_list<int> args) : QList(args) { }
|
|
};
|
|
|
|
#endif
|