diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 16:42:29 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-01-06 17:14:09 +0000 |
| commit | e8b8de4460235c458ab5c8e3249982628e9541bd (patch) | |
| tree | 078da79e69ec0c5cfebf6bd4139d2afdaf6c84cd /src/qml/jsruntime/qv4arraydata_p.h | |
| parent | 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a (diff) | |
Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Remove the helpers macros Q_STATIC_ASSERT_FOR_SANE_COMPILERS
and V4_ASSERT_IS_TRIVIAL.
Task-number: QTBUG-40658
Task-number: QTBUG-51673
Change-Id: Ifa4fab653b10ce7858739adef08364cddc6507cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4arraydata_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4arraydata_p.h b/src/qml/jsruntime/qv4arraydata_p.h index db9db5a220..46986c5e6f 100644 --- a/src/qml/jsruntime/qv4arraydata_p.h +++ b/src/qml/jsruntime/qv4arraydata_p.h @@ -142,7 +142,7 @@ DECLARE_HEAP_OBJECT(ArrayData, Base) { uint mappedIndex(uint index) const; }; -V4_ASSERT_IS_TRIVIAL(ArrayData) +Q_STATIC_ASSERT(std::is_trivial< ArrayData >::value); struct SimpleArrayData : public ArrayData { uint mappedIndex(uint index) const { index += offset; if (index >= values.alloc) index -= values.alloc; return index; } @@ -157,7 +157,7 @@ struct SimpleArrayData : public ArrayData { return attrs ? attrs[i] : Attr_Data; } }; -V4_ASSERT_IS_TRIVIAL(SimpleArrayData) +Q_STATIC_ASSERT(std::is_trivial< SimpleArrayData >::value); struct SparseArrayData : public ArrayData { void destroy() { |