diff options
author | Allan Sandfeld Jensen <[email protected]> | 2016-10-08 13:03:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <[email protected]> | 2016-10-10 04:41:42 +0000 |
commit | 376077a8e73100ccada6f2bb81c6664817bb44ba (patch) | |
tree | e7b8aafe38d3a2c9a71f55e30e1b669c38768dbd /src/qml/jsruntime/qv4arraydata.cpp | |
parent | a292697222dd85e586f26bd7133f3e17e30992c2 (diff) |
Fix developer-build with gcc 6
Locally suppress bogus tautological compare warnings.
Task-number: QTBUG-56266
Change-Id: Ic1b554982a778cdd89c8047483523c44d53bbadd
Reviewed-by: Thiago Macieira <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index ec0e6111ab..85d8155d3c 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -40,6 +40,8 @@ using namespace QV4; +QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_ON + const QV4::VTable QV4::ArrayData::static_vtbl = { 0, QV4::ArrayData::IsExecutionContext, @@ -88,6 +90,8 @@ const ArrayVTable SparseArrayData::static_vtbl = SparseArrayData::length }; +QT_WARNING_SUPPRESS_GCC_TAUTOLOGICAL_COMPARE_OFF + Q_STATIC_ASSERT(sizeof(Heap::ArrayData) == sizeof(Heap::SimpleArrayData)); Q_STATIC_ASSERT(sizeof(Heap::ArrayData) == sizeof(Heap::SparseArrayData)); |