diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 09:36:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-24 11:18:22 +0000 |
| commit | 3966ab51ff140f173f1f0c23fa3a9ef985c73d27 (patch) | |
| tree | f30302c2c40e8d1b30e3ab589917eca5883aa3a2 /src/corelib/thread/qbasicatomic.h | |
| parent | 0861c2176c6dc1c69b733c1a843c2db5ec8ea786 (diff) | |
| parent | 4783de0473a288fdff7e5354c12315ba025ec7e0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 447fca44c01..24218e833af 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -61,6 +61,9 @@ # error "Qt requires C++11 support" #endif +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4522) + QT_BEGIN_NAMESPACE #if 0 @@ -323,4 +326,6 @@ public: QT_END_NAMESPACE +QT_WARNING_POP + #endif // QBASICATOMIC_H |