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/qv4context_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/qv4context_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4context_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 4efd0bc899..dfac5534be 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -143,7 +143,7 @@ DECLARE_HEAP_OBJECT(ExecutionContext, Base) { quint8 padding_[4]; #endif }; -V4_ASSERT_IS_TRIVIAL(ExecutionContext) +Q_STATIC_ASSERT(std::is_trivial< ExecutionContext >::value); Q_STATIC_ASSERT(sizeof(ExecutionContext) == sizeof(Base) + sizeof(ExecutionContextData) + QT_POINTER_SIZE); Q_STATIC_ASSERT(std::is_standard_layout<ExecutionContextData>::value); @@ -170,7 +170,7 @@ DECLARE_HEAP_OBJECT(CallContext, ExecutionContext) { } void setArg(uint index, Value v); }; -V4_ASSERT_IS_TRIVIAL(CallContext) +Q_STATIC_ASSERT(std::is_trivial< CallContext >::value); Q_STATIC_ASSERT(std::is_standard_layout<CallContextData>::value); Q_STATIC_ASSERT(offsetof(CallContextData, function) == 0); //### The following size check fails on Win8. With the ValueArray at the end of the @@ -190,7 +190,7 @@ DECLARE_HEAP_OBJECT(CatchContext, ExecutionContext) { void init(ExecutionContext *outerContext, String *exceptionVarName, const Value &exceptionValue); }; -V4_ASSERT_IS_TRIVIAL(CatchContext) +Q_STATIC_ASSERT(std::is_trivial< CatchContext >::value); } |