feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compile

Browse Source 
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>
This commit is contained in:
Robert Loehning
2014-10-24 12:20:48 +02:00
committed by hjk
parent 7735dd6e94
commit 880b7625ec
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/algorithm.h
View File

@@ -143,9 +143,10 @@ auto equal(R (S::*function)() const, T value)
// transform taking a member function pointer // transform taking a member function pointer
template<typename T, typename R, typename S> template<typename T, typename R, typename S>
Q_REQUIRED_RESULT 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()); result.reserve(container.size());
std::transform(container.begin(), container.end(), std::transform(container.begin(), container.end(),
std::back_inserter(result), std::back_inserter(result),
@@ -164,9 +165,9 @@ T &&declval();
template<typename T, typename F> template<typename T, typename F>
Q_REQUIRED_RESULT Q_REQUIRED_RESULT
auto transform(const QList<T> &container, F function) 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()); result.reserve(container.size());
std::transform(container.begin(), container.end(), std::transform(container.begin(), container.end(),
std::back_inserter(result), std::back_inserter(result),