diff --git a/src/concurrent/qtconcurrentcompilertest.h b/src/concurrent/qtconcurrentcompilertest.h index 8292d5c5045..a5456f8d279 100644 --- a/src/concurrent/qtconcurrentcompilertest.h +++ b/src/concurrent/qtconcurrentcompilertest.h @@ -51,8 +51,8 @@ namespace QtPrivate { template struct IsIterable : std::false_type {}; template - struct IsIterable())), - decltype(std::end(std::declval()))>> + struct IsIterable().begin()), + decltype(std::declval().end())>> : std::true_type { }; diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index bb78ea99537..be954167598 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -77,7 +77,7 @@ struct Argument template struct Argument>::type> { - using Type = std::decay_t()))>; + using Type = std::decay_t().begin())>; }; template diff --git a/tests/auto/concurrent/qtconcurrentmap/functions.h b/tests/auto/concurrent/qtconcurrentmap/functions.h index e5090ef03e8..aeba7949774 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: