diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-01-04 15:32:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-01-04 15:32:34 +0100 |
| commit | a503bf54705d89204007e8f887b668fe5ef519fc (patch) | |
| tree | b2d1a452da39450eac78a1aeb1df116a73f64b23 /src/3rdparty/forkfd | |
| parent | e65c43fd0ffa57248e7d750570b7deae171a82f5 (diff) | |
| parent | 1f87fb359fdff14e42662384a9c8a0bcb3837671 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
5b4b437b30b320e2cd7c9a566999a39772e5d431 from 5.15 into dev.
src/widgets/kernel/qapplication.cpp
tests/auto/tools/moc/allmocs_baseline_in.json
Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01
Diffstat (limited to 'src/3rdparty/forkfd')
| -rw-r--r-- | src/3rdparty/forkfd/forkfd_c11.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/forkfd/forkfd_c11.h b/src/3rdparty/forkfd/forkfd_c11.h index f3dc2b5357..2b1d3f181e 100644 --- a/src/3rdparty/forkfd/forkfd_c11.h +++ b/src/3rdparty/forkfd/forkfd_c11.h @@ -36,7 +36,7 @@ # define FFD_ATOMIC_ACQUIRE std::memory_order_acquire # define FFD_ATOMIC_RELEASE std::memory_order_release // acq_rel & cst not necessary -typedef std::atomic_int ffd_atomic_int; +typedef std::atomic<int> ffd_atomic_int; #else # include <stdatomic.h> # define ffd_atomic_pointer(type) _Atomic(type*) |