summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-19 13:58:09 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-05-02 12:57:05 (GMT)
commite9d198b5928e1adf678796c098113bc307ef53f5 (patch)
tree5407b313671b191d3558f309193769d1dee326ee /src/corelib/concurrent/qtconcurrentfunctionwrappers.h
parent5fc99e9f8e3b24c712d1673d3b55afa8c8090cb4 (diff)
downloadQt-e9d198b5928e1adf678796c098113bc307ef53f5.zip
Qt-e9d198b5928e1adf678796c098113bc307ef53f5.tar.gz
Qt-e9d198b5928e1adf678796c098113bc307ef53f5.tar.bz2
get rid of the DisableIfSame hack
By changing the order of the parametters, in a way it is unlikely to clash
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentfunctionwrappers.h')
-rw-r--r--src/corelib/concurrent/qtconcurrentfunctionwrappers.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
index 1c19164..5652609 100644
--- a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
+++ b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
@@ -286,18 +286,6 @@ struct MapResultType<QStringList, U(C::*)() const>
typedef QList<U> ResultType;
};
-template <typename ReturnType, typename T>
-struct DisableIfSame
-{
- typedef ReturnType Type;
-};
-
-template <typename T>
-struct DisableIfSame<T, T>
-{
-
-};
-
} // namespace QtPrivate.
#endif //qdoc