summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-19 15:58:09 +0200
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-10 12:54:53 +0200
commit7efa2f6aab6801783e236d66331ae1d88ebf17ff (patch)
tree2a537ff686f5c821b16c7b6695a629acc2286eb8 /src/corelib/concurrent/qtconcurrentfunctionwrappers.h
parent5d85018720f8a5ba60be45a541c2e8fd9b413578 (diff)
get rid of the DisableIfSame hack
By changing the order of the parametters, in a way it is unlikely to clash (cherry picked from commit e9d198b5928e1adf678796c098113bc307ef53f5)
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 1c19164b30..56526091fe 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