diff options
Diffstat (limited to 'tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp')
| -rw-r--r-- | tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp index 4361609442..347831819e 100644 --- a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp @@ -1,33 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtTest/QtTest> +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2016 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#include <QTest> #include <qatomic.h> #include <limits.h> @@ -73,7 +48,7 @@ void tst_QAtomicPointer::warningFreeHelper() { qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only."); - QBasicAtomicPointer<WFHC> p = Q_BASIC_ATOMIC_INITIALIZER(0); + QBasicAtomicPointer<WFHC> p = Q_BASIC_ATOMIC_INITIALIZER(nullptr); p.loadRelaxed()->bar(); @@ -645,8 +620,8 @@ void tst_QAtomicPointer::forwardDeclared() // this is just a compilation test QAtomicPointer<ForwardDeclared> ptr; ContainsForwardDeclared cfd; - Q_UNUSED(ptr); - Q_UNUSED(cfd); + Q_UNUSED(ptr) + Q_UNUSED(cfd) QVERIFY(true); } @@ -661,7 +636,7 @@ template <typename T> static void operators_helper() { // Test that QBasicAtomicPointer also has operator= and cast operators // We've been using them for QAtomicPointer<T> elsewhere - QBasicAtomicPointer<T> atomic = Q_BASIC_ATOMIC_INITIALIZER(0); + QBasicAtomicPointer<T> atomic = Q_BASIC_ATOMIC_INITIALIZER(nullptr); atomic = one; QCOMPARE(Ptr(atomic), one); } |