diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-09-05 09:49:55 +0200 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2017-09-05 14:00:39 +0000 |
| commit | aa95e9e98618d8838ba6d83f3cc365113ca6f410 (patch) | |
| tree | 6d777afb8440af118dfbd84d3ef0adcaf7fc990d /src/corelib/thread/qatomic.h | |
| parent | cf24d203850cd87e31bc123407e7ae126be9961c (diff) | |
Fix zero-as-null-pointer-constant warning in QObject
Change-Id: Icf0c836b96cd750edeee71c144e2bd9917a96815
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'src/corelib/thread/qatomic.h')
| -rw-r--r-- | src/corelib/thread/qatomic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index f9eacbf6f0..f17c38e2fe 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -168,9 +168,9 @@ class QAtomicPointer : public QBasicAtomicPointer<T> { public: #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS - constexpr QAtomicPointer(T *value = 0) Q_DECL_NOTHROW : QBasicAtomicPointer<T>(value) {} + constexpr QAtomicPointer(T *value = nullptr) Q_DECL_NOTHROW : QBasicAtomicPointer<T>(value) {} #else - inline QAtomicPointer(T *value = 0) Q_DECL_NOTHROW + inline QAtomicPointer(T *value = nullptr) Q_DECL_NOTHROW { this->store(value); } |