diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-07 14:26:42 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-10 08:18:46 +0000 |
| commit | e9a8252305fa5e3b3cd4a18261990820975a79da (patch) | |
| tree | bdc6ae7afdd73ac5d6b8ae98bef8e03f92fd2f95 /src/qml/jsruntime/qv4runtimeapi_p.h | |
| parent | fee680b24a41c177a23f82fc7334ab593931afea (diff) | |
Don't throw exceptions in Object::delete(indexed) anymore
Change-Id: I8613ab21eb1435903e2a8514c21fe51f4a305a2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4runtimeapi_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4runtimeapi_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h index ba4a55f864..d67761ccfc 100644 --- a/src/qml/jsruntime/qv4runtimeapi_p.h +++ b/src/qml/jsruntime/qv4runtimeapi_p.h @@ -58,7 +58,6 @@ namespace QV4 { typedef uint Bool; struct NoThrowEngine; - namespace { template <typename T> struct ExceptionCheck { @@ -120,10 +119,10 @@ struct ExceptionCheck<void (*)(QV4::NoThrowEngine *, A, B, C)> { F(ReturnedValue, typeofName, (ExecutionEngine *engine, int nameIndex)) \ \ /* delete */ \ - F(ReturnedValue, deleteElement, (ExecutionEngine *engine, const Value &base, const Value &index)) \ - F(ReturnedValue, deleteMember, (ExecutionEngine *engine, const Value &base, int nameIndex)) \ - F(ReturnedValue, deleteMemberString, (ExecutionEngine *engine, const Value &base, String *name)) \ - F(ReturnedValue, deleteName, (ExecutionEngine *engine, int nameIndex)) \ + F(bool, deleteElement, (ExecutionEngine *engine, const Value &base, const Value &index)) \ + F(bool, deleteMember, (ExecutionEngine *engine, const Value &base, int nameIndex)) \ + F(bool, deleteMemberString, (ExecutionEngine *engine, const Value &base, String *name)) \ + F(bool, deleteName, (ExecutionEngine *engine, int nameIndex)) \ \ /* exceptions & scopes */ \ F(void, throwException, (ExecutionEngine *engine, const Value &value)) \ |