From 6d05ba7bfcd6f0ae1e1af100cd4aab1cdc0c3a8c Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 6 Dec 2017 17:25:24 +0100
Subject: Algorithm: Fix compilation with Xcode 7.2.1

Change-Id: I4413841adc00156a4c8877c00ba6929262ae8e8f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/libs/utils/algorithm.h | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/libs')

diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index c0fb62b645f..7c0b73d2028 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -333,7 +333,7 @@ inserter(QSet<X> &container)
 // different container types for input and output, e.g. transforming a QList into a QSet
 
 // function:
-template<template<typename, typename...> class C, // result container type
+template<template<typename> class C, // result container type
          template<typename...> class SC, // input container type
          typename F, // function type
          typename... SCArgs, // Arguments to SC
@@ -348,6 +348,22 @@ decltype(auto) transform(const SC<SCArgs...> &container, F function)
     return result;
 }
 
+template<template<typename, typename> class C, // result container type
+         template<typename...> class SC, // input container type
+         typename F, // function type
+         typename... SCArgs, // Arguments to SC
+         typename Value = typename SC<SCArgs...>::value_type,
+         typename Result = std::decay_t<std::result_of_t<F(Value)>>,
+         typename ResultContainer = C<Result, std::allocator<Result>>>
+Q_REQUIRED_RESULT
+decltype(auto) transform(const SC<SCArgs...> &container, F function)
+{
+    ResultContainer result;
+    result.reserve(container.size());
+    std::transform(std::begin(container), std::end(container), inserter(result), function);
+    return result;
+}
+
 // member function:
 template<template<typename...> class C, // result container type
          template<typename...> class SC, // input container type
-- 
cgit v1.2.3