diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-04-12 14:55:57 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-04-13 15:50:34 +0200 |
| commit | 7582de8bea88795926224667dac5239c2358ec4a (patch) | |
| tree | d44d3e6681d60b1ad9e4d3d7917c226b1f20d6c4 /src/qml/jsruntime/qv4enginebase_p.h | |
| parent | c08086cf482339914c39adb453fdda1b52d43ab3 (diff) | |
QV4::EngineBase: Remove pragma pack
This was only used on a subset of our compilers, and caused issues with
pointer alignment. We have static_assert's in place to verify that the
struct members are in the correct place, and pack had no effect anyway
after we added the alignment padding to the struct.
Change-Id: I162664ec01d4b5d97ac800afc354d0ab2e04de42
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4enginebase_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4enginebase_p.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h index 17e47e1b05..9997c477bf 100644 --- a/src/qml/jsruntime/qv4enginebase_p.h +++ b/src/qml/jsruntime/qv4enginebase_p.h @@ -60,10 +60,6 @@ namespace QV4 { struct CppStackFrame; // Base class for the execution engine - -#if defined(Q_CC_MSVC) || defined(Q_CC_GNU) -#pragma pack(push, 1) -#endif struct Q_QML_EXPORT EngineBase { CppStackFrame *currentStackFrame = nullptr; @@ -139,9 +135,6 @@ struct Q_QML_EXPORT EngineBase { Heap::InternalClass *classes[NClasses]; Heap::InternalClass *internalClasses(InternalClassType icType) { return classes[icType]; } }; -#if defined(Q_CC_MSVC) || defined(Q_CC_GNU) -#pragma pack(pop) -#endif Q_STATIC_ASSERT(std::is_standard_layout<EngineBase>::value); Q_STATIC_ASSERT(offsetof(EngineBase, currentStackFrame) == 0); |