From 1865b1b9890e6b9875b487ed267e379097015c5c Mon Sep 17 00:00:00 2001 From: Serg Kryvonos Date: Fri, 8 Dec 2023 14:49:09 +0100 Subject: [PATCH] 'transform' algorithm compatibility to C++20 Change-Id: I3d2e756bb5bbc034b36fd74b2569f089949b898b Reviewed-by: Qt CI Bot Reviewed-by: Eike Ziller --- src/libs/utils/algorithm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h index 26c0ff1b903..10593372771 100644 --- a/src/libs/utils/algorithm.h +++ b/src/libs/utils/algorithm.h @@ -905,7 +905,7 @@ template class C, // container type typename F, // function type typename... CArgs> // Arguments to SC Q_REQUIRED_RESULT -decltype(auto) transform(C &container, F function) +auto transform(C &container, F function) -> decltype(auto) { return transform &>(container, function); } @@ -937,7 +937,7 @@ decltype(auto) transform(C &container, R S::*p) template class C = QList, // result container typename F> // Arguments to C Q_REQUIRED_RESULT -decltype(auto) transform(const QStringList &container, F function) +auto transform(const QStringList &container, F function) { return transform &>(static_cast>(container), function); }