diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-30 17:53:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-02 11:14:29 +0000 |
| commit | a2b38f64e6def1538b9d153ec4c6589fa9b6d3c0 (patch) | |
| tree | 1f1e97fecc126233edad4b942cb019d26a065b6e /src/corelib/thread | |
| parent | 7a0d4b39daa1beed7070ceb43414eb55934f1266 (diff) | |
Remove handling of missing =delete and =default support
Change-Id: I006dfd0b7cfa3bda5e5ab01bcefa851f031dfe0e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qatomic_cxx11.h | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qthread.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/thread/qatomic_cxx11.h b/src/corelib/thread/qatomic_cxx11.h index 32d27734fc..2851bae73e 100644 --- a/src/corelib/thread/qatomic_cxx11.h +++ b/src/corelib/thread/qatomic_cxx11.h @@ -462,7 +462,7 @@ template <typename X> struct QAtomicOps } }; -#if defined(Q_COMPILER_CONSTEXPR) && defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS) +#if defined(Q_COMPILER_CONSTEXPR) # define Q_BASIC_ATOMIC_INITIALIZER(a) { a } #else # define Q_BASIC_ATOMIC_INITIALIZER(a) { ATOMIC_VAR_INIT(a) } diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 4c3c1fc01f..7d2e06a499 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -75,7 +75,7 @@ QT_END_NAMESPACE // New atomics -#if defined(Q_COMPILER_CONSTEXPR) && defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS) +#if defined(Q_COMPILER_CONSTEXPR) # if defined(Q_CC_CLANG) && Q_CC_CLANG < 303 /* Do not define QT_BASIC_ATOMIC_HAS_CONSTRUCTORS for Clang before version 3.3. diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index 8e92d75401..c7a6dc8f1a 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -209,7 +209,6 @@ struct Callable { } -#if defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS) // Apply the same semantics of a lambda closure type w.r.t. the special // member functions, if possible: delete the copy assignment operator, // bring back all the others as per the RO5 (cf. ยง8.1.5.1/11 [expr.prim.lambda.closure]) @@ -218,7 +217,6 @@ struct Callable Callable(Callable &&) = default; Callable &operator=(const Callable &) = delete; Callable &operator=(Callable &&) = default; -#endif void operator()() { |