summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtconcurrentmap
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2011-08-26 13:43:06 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-09-02 10:46:39 (GMT)
commitca34cc75294e0d2a8bc491a2c679fe8a69cd0408 (patch)
tree5b6bb61a1d32b187755135dde508ca3bb4bd4e5d /tests/auto/qtconcurrentmap
parent6b1a8129623e3716f2fc075608b260ce7c381fe2 (diff)
downloadQt-ca34cc75294e0d2a8bc491a2c679fe8a69cd0408.zip
Qt-ca34cc75294e0d2a8bc491a2c679fe8a69cd0408.tar.gz
Qt-ca34cc75294e0d2a8bc491a2c679fe8a69cd0408.tar.bz2
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
Diffstat (limited to 'tests/auto/qtconcurrentmap')
-rw-r--r--tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp
index f4249ab..336dc71 100644
--- a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -2320,10 +2320,6 @@ void tst_QtConcurrentMap::stlContainers()
{
#ifdef QT_NO_STL
QSKIP("Qt compiled without STL support", SkipAll);
-#elif defined(Q_COMPILER_RVALUE_REFS)
- //mapped uses &Container::push_back, but in c++0x, std::vector has two overload of it
- // meaning it is not possible to take the address of that function anymore.
- QSKIP("mapped do not work with c++0x stl vector", SkipAll);
#else
std::vector<int> vector;
vector.push_back(1);