diff options
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h index 6168d59914..3e501f23ce 100644 --- a/src/qml/jsruntime/qv4objectiterator_p.h +++ b/src/qml/jsruntime/qv4objectiterator_p.h @@ -73,7 +73,7 @@ struct Q_QML_EXPORT ObjectIteratorData uint memberIndex; uint flags; }; -V4_ASSERT_IS_TRIVIAL(ObjectIteratorData) +Q_STATIC_ASSERT(std::is_trivial< ObjectIteratorData >::value); struct Q_QML_EXPORT ObjectIterator: ObjectIteratorData { @@ -116,6 +116,7 @@ struct ForEachIteratorObject : Object { ObjectIterator &it() { return *reinterpret_cast<ObjectIterator*>(&itData); } Value workArea[2]; + static void markObjects(Heap::Base *that, MarkStack *markStack); private: ObjectIteratorData itData; }; @@ -127,9 +128,6 @@ struct ForEachIteratorObject: Object { Q_MANAGED_TYPE(ForeachIteratorObject) ReturnedValue nextPropertyName() { return d()->it().nextPropertyNameAsString(); } - -protected: - static void markObjects(Heap::Base *that, MarkStack *markStack); }; inline |