diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-09-11 11:07:32 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-17 07:47:09 +0000 |
| commit | 1dac47c1418b44cf4a56b42bfca2b277795fd213 (patch) | |
| tree | 26727943c30628340662a66d7cbe9f52d75c5b58 /src/qml/jsruntime/qv4context.cpp | |
| parent | d89d5cffe79bd060a1b04a2c47a3d728bffbe195 (diff) | |
Cleanups in Value/Primitive
Get rid of Primitive and move the corresponding methods
directly into Value. Mark many methods in Value as
constexpr and turn Value into a POD type again.
Keep Primitive as a pure alias to Value for source
compatibility of other modules that might be using it.
Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index d22179173c..6e3e7f9b4f 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -115,7 +115,7 @@ Heap::CallContext *ExecutionContext::newCallContext(CppStackFrame *frame) c->locals.size = nLocals; c->locals.alloc = localsAndFormals; // memory allocated from the JS heap is 0 initialized, so check if empty is 0 - Q_ASSERT(Primitive::undefinedValue().asReturnedValue() == 0); + Q_ASSERT(Value::undefinedValue().asReturnedValue() == 0); c->setupLocalTemporalDeadZone(compiledFunction); |