Wrap calls to Sequence::push_back

In C++11 push_back is overloaded to support rvalue-references,

   void std::vector<T>::push_back(const T &);
   void std::vector<T>::push_back(T &&);

so attempting to get the address for push_back is ambiguous.

Instead of hardcoding the function signature, the better and more
general solution is to allow the compiler to do the required overload
resolution itself, also allowing for implicit conversions to take place.

Task-number: QTBUG-18996
Done-with: Liang Qi
Reviewed-by: Olivier Goffart

1 files changed, 4 insertions, 4 deletions

diff --git a/src/corelib/concurrent/qtconcurrentmap.h b/src/corelib/concurrent/qtconcurrentmap.h
index 37a4143..166d5c8 100644
--- a/src/corelib/concurrent/qtconcurrentmap.h
+++ b/src/corelib/concurrent/qtconcurrentmap.h
@@ -271,7 +271,7 @@ OutputSequence blockingMapped(const InputSequence &sequence, MapFunctor map)
     return blockingMappedReduced<OutputSequence>
         (sequence,
          QtPrivate::createFunctionWrapper(map),
-         &OutputSequence::push_back,
+         QtPrivate::PushBackWrapper(),
          QtConcurrent::OrderedReduce);
 }
 
@@ -282,7 +282,7 @@ typename QtPrivate::MapResultType<InputSequence, MapFunctor>::ResultType blockin
     return blockingMappedReduced<OutputSequence>
         (sequence,
          QtPrivate::createFunctionWrapper(map),
-         &OutputSequence::push_back,
+         QtPrivate::PushBackWrapper(),
          QtConcurrent::OrderedReduce);
 }
 
@@ -293,7 +293,7 @@ Sequence blockingMapped(Iterator begin, Iterator end, MapFunctor map)
     return blockingMappedReduced<Sequence>
         (begin, end,
          QtPrivate::createFunctionWrapper(map),
-         &Sequence::push_back,
+         QtPrivate::PushBackWrapper(),
          QtConcurrent::OrderedReduce);
 }
 
@@ -304,7 +304,7 @@ typename QtPrivate::MapResultType<Iterator, MapFunctor>::ResultType blockingMapp
     return blockingMappedReduced<OutputSequence>
         (begin, end,
          QtPrivate::createFunctionWrapper(map),
-         &OutputSequence::push_back,
+         QtPrivate::PushBackWrapper(),
          QtConcurrent::OrderedReduce);
 }