diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-09-09 10:43:08 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-10-05 14:40:59 +0000 |
| commit | 1b90dc4482d001512f09a5785d4cbd8030879d82 (patch) | |
| tree | 6c2b0816b6e8bf1aa781c44bacd15ce11825a66a /src/qml/jsruntime/qv4string_p.h | |
| parent | 64afa01c32fc1824b280452ceb1ade4f655487f2 (diff) | |
QML: Make Heap::RegExp and Heap::String trivial
Change-Id: Ia8eda67c9d59069d3a64363699720a79ba1348a1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4string_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 50b7fb664a..40c5c8a263 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -71,8 +71,8 @@ struct Q_QML_PRIVATE_EXPORT String : Base { }; #ifndef V4_BOOTSTRAP - String(MemoryManager *mm, const QString &text); - String(MemoryManager *mm, String *l, String *n, bool dummy); + void init(MemoryManager *mm, const QString &text); + void init(MemoryManager *mm, String *l, String *n); void destroy() { if (!largestSubLength && !text->ref.deref()) QStringData::deallocate(text); @@ -133,6 +133,7 @@ private: static void append(const String *data, QChar *ch); #endif }; +Q_STATIC_ASSERT(std::is_trivial<String>::value); } |