diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-08 21:55:06 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-10 08:19:34 +0000 |
| commit | d5cacaf6b2adb269b9e24b518e1496bca935bc34 (patch) | |
| tree | e95631610e46956f24aa6284526645a25b86ab9a /src/qml/jsruntime/qv4context_p.h | |
| parent | 7c0dbaa3db649fb348af533820ac0550bc144d96 (diff) | |
Remove stuff related to simple call contexts
Those are not being used anymore.
Change-Id: Ia33dd7c3c7ea7828caef0fbf397253249580a4e1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4context_p.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 1f62c64a23..8c533f775c 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -116,8 +116,7 @@ DECLARE_HEAP_OBJECT(ExecutionContext, Base) { Type_CatchContext = 0x2, Type_WithContext = 0x3, Type_QmlContext = 0x4, - Type_SimpleCallContext = 0x5, - Type_CallContext = 0x6 + Type_CallContext = 0x5 }; void init(ContextType t) @@ -150,9 +149,9 @@ Q_STATIC_ASSERT(offsetof(ExecutionContextData, v4Function) == offsetof(Execution DECLARE_HEAP_OBJECT(CallContext, ExecutionContext) { DECLARE_MARK_TABLE(CallContext); - void init(ContextType t = Type_SimpleCallContext) + void init() { - ExecutionContext::init(t); + ExecutionContext::init(Type_CallContext); } inline unsigned int formalParameterCount() const; @@ -250,12 +249,12 @@ struct CatchContext : public ExecutionContext inline CallContext *ExecutionContext::asCallContext() { - return d()->type >= Heap::ExecutionContext::Type_SimpleCallContext ? static_cast<CallContext *>(this) : 0; + return d()->type == Heap::ExecutionContext::Type_CallContext ? static_cast<CallContext *>(this) : 0; } inline const CallContext *ExecutionContext::asCallContext() const { - return d()->type >= Heap::ExecutionContext::Type_SimpleCallContext ? static_cast<const CallContext *>(this) : 0; + return d()->type == Heap::ExecutionContext::Type_CallContext ? static_cast<const CallContext *>(this) : 0; } } // namespace QV4 |