diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-04 12:22:00 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:48:54 +0200 |
| commit | 05f17e841f971d3c8f635cc044c60c970c2055c9 (patch) | |
| tree | 0eaf8348ef9d9b25c050527ec6c7de8aac9a56ea /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | c2ef5bff232f758716f1665e5d9d9b9b2f20385d (diff) | |
Get rid of different macros for vtable specializations
Detect existence of a a vtable entry at compile time.
Change-Id: Ieed5d34b063184bc4435b22c6685ac0e3fabf493
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index f00df25354..04d1afbf76 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -72,7 +72,7 @@ using namespace QV4; -DEFINE_OBJECT_VTABLE_NO_DESTROY(FunctionObject); +DEFINE_OBJECT_VTABLE(FunctionObject); FunctionObject::FunctionObject(ExecutionContext *scope, const StringRef name, bool createProto) : Object(scope->engine->functionClass) @@ -183,7 +183,7 @@ FunctionObject *FunctionObject::createScriptFunction(ExecutionContext *scope, Fu return new (scope->engine->memoryManager) SimpleScriptFunction(scope, function, createProto); } -DEFINE_OBJECT_VTABLE_NO_DESTROY(FunctionCtor); +DEFINE_OBJECT_VTABLE(FunctionCtor); FunctionCtor::FunctionCtor(ExecutionContext *scope) : FunctionObject(scope, QStringLiteral("Function")) @@ -353,7 +353,7 @@ ReturnedValue FunctionPrototype::method_bind(CallContext *ctx) return ctx->engine->newBoundFunction(ctx->engine->rootContext, target, boundThis, boundArgs)->asReturnedValue(); } -DEFINE_OBJECT_VTABLE_NO_DESTROY(ScriptFunction); +DEFINE_OBJECT_VTABLE(ScriptFunction); ScriptFunction::ScriptFunction(ExecutionContext *scope, Function *function) : SimpleScriptFunction(scope, function, true) @@ -426,7 +426,7 @@ ReturnedValue ScriptFunction::call(Managed *that, CallData *callData) return result.asReturnedValue(); } -DEFINE_OBJECT_VTABLE_NO_DESTROY(SimpleScriptFunction); +DEFINE_OBJECT_VTABLE(SimpleScriptFunction); SimpleScriptFunction::SimpleScriptFunction(ExecutionContext *scope, Function *function, bool createProto) : FunctionObject(scope, function->name(), createProto) @@ -550,7 +550,7 @@ InternalClass *SimpleScriptFunction::internalClassForConstructor() -DEFINE_OBJECT_VTABLE_NO_DESTROY(BuiltinFunction); +DEFINE_OBJECT_VTABLE(BuiltinFunction); BuiltinFunction::BuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(CallContext *)) : FunctionObject(scope, name) @@ -602,7 +602,7 @@ ReturnedValue IndexedBuiltinFunction::call(Managed *that, CallData *callData) return f->code(&ctx, f->index); } -DEFINE_OBJECT_VTABLE_NO_DESTROY(IndexedBuiltinFunction); +DEFINE_OBJECT_VTABLE(IndexedBuiltinFunction); DEFINE_OBJECT_VTABLE(BoundFunction); |