diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-15 01:00:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-15 01:00:42 +0100 |
| commit | 48e2b2e6eb37f06c93c77bde89e8ae0610038a6f (patch) | |
| tree | 35cd4ccef3337e48ac56cf9a16256412efa039ea /src/qml/memory | |
| parent | 3f4496ecea2cb1cb773c899675a6ecd0ef6183d5 (diff) | |
| parent | 5b1538d1c0b408bb54786336f2e59c208686edb2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I98ef98ca603a1d82f944973a06375e65192fdab2
Diffstat (limited to 'src/qml/memory')
| -rw-r--r-- | src/qml/memory/qv4mmdefs_p.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/memory/qv4mmdefs_p.h b/src/qml/memory/qv4mmdefs_p.h index 3e2bae46c2..8a53492822 100644 --- a/src/qml/memory/qv4mmdefs_p.h +++ b/src/qml/memory/qv4mmdefs_p.h @@ -323,23 +323,23 @@ struct MarkStack { #define DECLARE_HEAP_OBJECT_BASE(name, base) \ -struct name##OffsetStruct { \ - name##Members(name, HEAP_OBJECT_OFFSET_MEMBER_EXPANSION) \ -}; \ -struct name##SizeStruct : base, name##OffsetStruct {}; \ -struct name##Data { \ - typedef base SuperClass; \ - static Q_CONSTEXPR size_t baseOffset = sizeof(name##SizeStruct) - sizeof(name##OffsetStruct); \ - name##Members(name, HEAP_OBJECT_MEMBER_EXPANSION) \ -}; \ -Q_STATIC_ASSERT(sizeof(name##SizeStruct) == sizeof(name##Data) + name##Data::baseOffset); \ + struct name##OffsetStruct { \ + name##Members(name, HEAP_OBJECT_OFFSET_MEMBER_EXPANSION) \ + }; \ + struct name##SizeStruct : base, name##OffsetStruct {}; \ + struct name##Data { \ + typedef base SuperClass; \ + static Q_CONSTEXPR size_t baseOffset = sizeof(name##SizeStruct) - sizeof(name##OffsetStruct); \ + name##Members(name, HEAP_OBJECT_MEMBER_EXPANSION) \ + }; \ + Q_STATIC_ASSERT(sizeof(name##SizeStruct) == sizeof(name##Data) + name##Data::baseOffset); \ #define DECLARE_HEAP_OBJECT(name, base) \ -DECLARE_HEAP_OBJECT_BASE(name, base) \ -struct name : base, name##Data + DECLARE_HEAP_OBJECT_BASE(name, base) \ + struct name : base, name##Data #define DECLARE_EXPORTED_HEAP_OBJECT(name, base) \ -DECLARE_HEAP_OBJECT_BASE(name, base) \ -struct Q_QML_EXPORT name : base, name##Data + DECLARE_HEAP_OBJECT_BASE(name, base) \ + struct Q_QML_EXPORT name : base, name##Data #define DECLARE_MARKOBJECTS(class) \ static void markObjects(Heap::Base *b, MarkStack *stack) { \ |