diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-10-12 14:24:07 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-10-13 09:49:51 +0200 |
| commit | d5c53554e5d71e3518a446b634428bb66fc369fd (patch) | |
| tree | 2efbf0d703fa400f6ef20e8bee4e8a7d690a0ac7 /tests/auto/concurrent | |
| parent | 1918c689d78b0f6a718343e7ebceb387acc32a97 (diff) | |
Loosen the requirements on the container passed to QtConcurrent::map*
Using std::begin() and std::end() forces the user to have const begin()
and end() member functions being defined for the passed container. This
is because std::declval<T>() returns rvalue which forces the compiler
to select std::{begin, end}()(const Container &c) overloads and an test
for a presence of const {begin, end}() methods.
Change-Id: I9d96d9f73891ece53224f1741a1334500f7b35ad
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto/concurrent')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentmap/functions.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/functions.h b/tests/auto/concurrent/qtconcurrentmap/functions.h index e5090ef03e..aeba794977 100644 --- a/tests/auto/concurrent/qtconcurrentmap/functions.h +++ b/tests/auto/concurrent/qtconcurrentmap/functions.h @@ -159,8 +159,6 @@ public: 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 &other) const { return data == other.data; } private: |