diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-11-21 12:29:40 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-11-21 12:29:40 +0100 |
| commit | d373d5e7d70e968cfba8957596ed6fe4f46990c8 (patch) | |
| tree | c52bf2b0fbbfdb13d644b4050aa7a931ef4b7109 /src/qml/jsruntime/qv4string.cpp | |
| parent | 9880acb424fd814501ba5fc4ae1caa989e23fafa (diff) | |
| parent | 9af8a47746b69b6040fc149c1d24602a1e25b08f (diff) | |
Merge remote-tracking branch 'origin/wip/new-backend' into dev
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir_p.h
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4vme_moth.cpp
tests/auto/qml/qml.pro
Change-Id: Ia7b6ec24c7fcbcbb1786d9e798d2df294020ae37
Diffstat (limited to 'src/qml/jsruntime/qv4string.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4string.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp index c0183a46a7..b38b01c9f7 100644 --- a/src/qml/jsruntime/qv4string.cpp +++ b/src/qml/jsruntime/qv4string.cpp @@ -52,17 +52,18 @@ using namespace QV4; #ifndef V4_BOOTSTRAP -DEFINE_MANAGED_VTABLE(String); - -void String::markObjects(Heap::Base *that, MarkStack *markStack) +void Heap::String::markObjects(Heap::Base *that, MarkStack *markStack) { - String::Data *s = static_cast<String::Data *>(that); + String *s = static_cast<String *>(that); if (s->largestSubLength) { s->left->mark(markStack); s->right->mark(markStack); } } +DEFINE_MANAGED_VTABLE(String); + + bool String::isEqualTo(Managed *t, Managed *o) { if (t == o) |