From 880b7625ec763ce291351b04f2fb8ce322d1fab0 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Fri, 24 Oct 2014 12:20:48 +0200
Subject: [PATCH] Fix compile

Done-by: Daniel Teske <daniel.teske@digia.com>
Task-number: QTCREATORBUG-13254
Change-Id: I51da8cd76ac2f2315bf8fd74f58e28a1980c98de
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/libs/utils/algorithm.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index da244de9303..a3659983ec4 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -143,9 +143,10 @@ auto equal(R (S::*function)() const, T value)
 // transform taking a member function pointer
 template<typename T, typename R, typename S>
 Q_REQUIRED_RESULT
-auto transform(const QList<T> &container, R (S::*p)() const) -> QList<R>
+auto transform(const QList<T> &container, R (S::*p)() const)
+    -> QList<typename std::remove_cv<typename std::remove_reference<R>::type>::type>
 {
-    QList<R> result;
+    QList<typename std::remove_cv<typename std::remove_reference<R>::type>::type> result;
     result.reserve(container.size());
     std::transform(container.begin(), container.end(),
                    std::back_inserter(result),
@@ -164,9 +165,9 @@ T &&declval();
 template<typename T, typename F>
 Q_REQUIRED_RESULT
 auto transform(const QList<T> &container, F function)
-     -> QList<typename std::remove_reference<decltype(function(declval<T>()))>::type>
+     -> QList<typename std::remove_cv<typename std::remove_reference<decltype(function(declval<T>()))>::type>::type>
 {
-    QList<typename std::remove_reference<decltype(function(declval<T>()))>::type> result;
+    QList<typename std::remove_cv<typename std::remove_reference<decltype(function(declval<T>()))>::type>::type> result;
     result.reserve(container.size());
     std::transform(container.begin(), container.end(),
                    std::back_inserter(result),