diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-03-18 09:38:00 -0700 |
|---|---|---|
| committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2018-03-19 20:36:41 +0000 |
| commit | 90493e16b8dd9edc6176d0abc255422edbbb05c3 (patch) | |
| tree | 5d276a4b29a8fba0eb3e48efa21b9af67973d322 /src/corelib/thread | |
| parent | 38597dd08083f1f5cbf947cd3b0290065f2872c6 (diff) | |
Atomics: remove qatomic_msvc.h
No longer needed. The comment about missing constexpr support is
incorrect: MSVC 2015 does have constexpr issues, but they don't affect
our use of std::atomic.
Change-Id: Ie9d9215342d449c48a11fffd151d11208137f00d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 92db7a6228..aacd12f220 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2011 Thiago Macieira <thiago@kde.org> -** Copyright (C) 2016 Intel Corporation. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,20 +45,8 @@ #if defined(QT_BOOTSTRAPPED) # include <QtCore/qatomic_bootstrap.h> - -// If C++11 atomics are supported, use them! -// Note that constexpr support is sometimes disabled in QNX builds but its -// library has <atomic>. -#elif defined(Q_COMPILER_ATOMICS) && (defined(Q_COMPILER_CONSTEXPR) || defined(Q_OS_QNX)) -# include <QtCore/qatomic_cxx11.h> - -// We only support one fallback: MSVC, because even on version 2015, it lacks full constexpr support -#elif defined(Q_CC_MSVC) -# include <QtCore/qatomic_msvc.h> - -// No fallback #else -# error "Qt requires C++11 support" +# include <QtCore/qatomic_cxx11.h> #endif QT_WARNING_PUSH |