diff options
Diffstat (limited to 'src/concurrent/qtconcurrentcompilertest.h')
-rw-r--r-- | src/concurrent/qtconcurrentcompilertest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/concurrent/qtconcurrentcompilertest.h b/src/concurrent/qtconcurrentcompilertest.h index 70f82e9904..72cf1670a0 100644 --- a/src/concurrent/qtconcurrentcompilertest.h +++ b/src/concurrent/qtconcurrentcompilertest.h @@ -3,7 +3,7 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the QtCore module of the Qt Toolkit. +** This file is part of the QtConcurrent module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -52,7 +52,7 @@ template<class T> class HasResultType { typedef char Yes; typedef void *No; - template<typename U> static Yes test(int, const typename U::result_type * = 0); + template<typename U> static Yes test(int, const typename U::result_type * = nullptr); template<typename U> static No test(double); public: enum { Value = (sizeof(test<T>(0)) == sizeof(Yes)) }; |